podman migration, collabora broken

This commit is contained in:
Danilo Reyes 2023-12-24 15:53:36 -06:00
parent cb9d64fd72
commit 2299f7d8c1
2 changed files with 23 additions and 7 deletions

View File

@ -1,25 +1,41 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ arion docker-compose ]; environment.systemPackages = with pkgs; [ podman-compose ];
virtualisation = { virtualisation = {
docker = { podman = {
enable = true; enable = true;
enableNvidia = true; enableNvidia = true;
storageDriver = "btrfs"; dockerCompat = true;
defaultNetwork.settings.dns_enabled = true;
autoPrune = {
enable = true;
flags = [ "--all" ];
dates = "weekly";
};
}; };
oci-containers = { oci-containers = {
backend = "docker";
containers = { containers = {
collabora = { collabora = {
image = "collabora/code"; image = "collabora/code";
imageFile = pkgs.dockerTools.pullImage {
imageName = "collabora/code";
imageDigest =
"sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
sha256 = "sha256-M66lynhzaOEFnE15Sy1N6lBbGDxwNw6ap+IUJAvoCLs=";
};
ports = [ "9980:9980" ]; ports = [ "9980:9980" ];
environment = { environment = {
domain = "cloud.servidos.lat"; domain = "cloud.servidos.lat";
username = "jawz"; username = "jawz";
password = "chichis"; password = "chichis";
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 = "--o:ssl.enable=false --o:ssl.termination=true"; extra_params = ''
--o:ssl.enable=false
--o:ssl.termination=true
'';
# --o:net.post_allow.host=\:\:ffff\:172\.16\.[0-9]{1,3}\.[0-9]{1,3}
# --o:storage.wopi.host=\:\:ffff\:172\.16\.[0-9]{1,3}\.[0-9]{1,3}
}; };
extraOptions = [ "--cap-add" "MKNOD" ]; extraOptions = [ "--cap-add" "MKNOD" ];
}; };
@ -46,7 +62,7 @@
ports = [ "5007:5005" ]; ports = [ "5007:5005" ];
volumes = [ volumes = [
"/var/lib/docker-configs/flame-nsfw:/app/data" "/var/lib/docker-configs/flame-nsfw:/app/data"
"/var/run/docker.sock:/var/run/docker.sock" # "/var/run/docker.sock:/var/run/docker.sock"
]; ];
environment = { environment = {
PUID = "1000"; PUID = "1000";

View File

@ -171,8 +171,8 @@ in {
${config.services.nextcloud.hostName} = { ${config.services.nextcloud.hostName} = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
serverAliases = [ "cloud.rotehaare.art" ];
http2 = true; http2 = true;
serverAliases = [ "cloud.rotehaare.art" ];
locations = { locations = {
"/".proxyWebsockets = true; "/".proxyWebsockets = true;
# uh, equals what? # uh, equals what?