Compare commits

..

No commits in common. "8ceb7f9868924a8db7f502e7d19e45c8fe775126" and "6f33ffe8c9760221f0cbd88e462c94c322ea6fd9" have entirely different histories.

4 changed files with 2 additions and 32 deletions

View file

@ -4874,7 +4874,7 @@ Here I only enable =networkmanager= and a few default networks. The rest of the
wifi-security = { wifi-security = {
auth-alg = "open"; auth-alg = "open";
key-mgmt = "wpa-psk"; key-mgmt = "wpa-psk";
psk = "$WLAN1_PW"; psk = "WLAN1_PW";
}; };
}; };
@ -7696,11 +7696,6 @@ This manages backups for my pictures and obsidian files.
passwordFile = config.sops.secrets.resticpw.path; passwordFile = config.sops.secrets.resticpw.path;
paths = [ paths = [
"/Vault/data/paperless" "/Vault/data/paperless"
"/Vault/data/koillection"
"/Vault/data/postgresql"
"/Vault/data/firefly-iii"
"/Vault/data/radicale"
"/Vault/data/matrix-synapse"
"/Vault/Eternor/Paperless" "/Vault/Eternor/Paperless"
"/Vault/Eternor/Bilder" "/Vault/Eternor/Bilder"
"/Vault/Eternor/Immich" "/Vault/Eternor/Immich"
@ -9070,7 +9065,6 @@ To get other URLs (token, etc.), use https://<kanidmDomain>/oauth2/openid/<clien
serviceName = "koillection"; serviceName = "koillection";
servicePort = 2282; servicePort = 2282;
serviceDomain = config.repo.secrets.common.services.domains.${serviceName}; serviceDomain = config.repo.secrets.common.services.domains.${serviceName};
serviceDir = "/Vault/data/koillection";
postgresUser = config.systemd.services.postgresql.serviceConfig.User; # postgres postgresUser = config.systemd.services.postgresql.serviceConfig.User; # postgres
postgresPort = config.services.postgresql.settings.port; # 5432 postgresPort = config.services.postgresql.settings.port; # 5432
@ -9102,10 +9096,6 @@ To get other URLs (token, etc.), use https://<kanidmDomain>/oauth2/openid/<clien
"${toString servicePort}:80" "${toString servicePort}:80"
]; ];
volumes = [
"${serviceDir}/uploads:/uploads"
];
environment = { environment = {
APP_DEBUG = "0"; APP_DEBUG = "0";
APP_ENV = "prod"; APP_ENV = "prod";
@ -9184,11 +9174,6 @@ To get other URLs (token, etc.), use https://<kanidmDomain>/oauth2/openid/<clien
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://${serviceName}"; proxyPass = "http://${serviceName}";
extraConfig = ''
proxy_buffer_size 128k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;
'';
}; };
}; };
}; };

View file

@ -118,7 +118,7 @@ in
wifi-security = { wifi-security = {
auth-alg = "open"; auth-alg = "open";
key-mgmt = "wpa-psk"; key-mgmt = "wpa-psk";
psk = "$WLAN1_PW"; psk = "WLAN1_PW";
}; };
}; };

View file

@ -5,7 +5,6 @@ let
serviceName = "koillection"; serviceName = "koillection";
servicePort = 2282; servicePort = 2282;
serviceDomain = config.repo.secrets.common.services.domains.${serviceName}; serviceDomain = config.repo.secrets.common.services.domains.${serviceName};
serviceDir = "/Vault/data/koillection";
postgresUser = config.systemd.services.postgresql.serviceConfig.User; # postgres postgresUser = config.systemd.services.postgresql.serviceConfig.User; # postgres
postgresPort = config.services.postgresql.settings.port; # 5432 postgresPort = config.services.postgresql.settings.port; # 5432
@ -37,10 +36,6 @@ in
"${toString servicePort}:80" "${toString servicePort}:80"
]; ];
volumes = [
"${serviceDir}/uploads:/uploads"
];
environment = { environment = {
APP_DEBUG = "0"; APP_DEBUG = "0";
APP_ENV = "prod"; APP_ENV = "prod";
@ -119,11 +114,6 @@ in
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://${serviceName}"; proxyPass = "http://${serviceName}";
extraConfig = ''
proxy_buffer_size 128k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;
'';
}; };
}; };
}; };

View file

@ -31,11 +31,6 @@ in
passwordFile = config.sops.secrets.resticpw.path; passwordFile = config.sops.secrets.resticpw.path;
paths = [ paths = [
"/Vault/data/paperless" "/Vault/data/paperless"
"/Vault/data/koillection"
"/Vault/data/postgresql"
"/Vault/data/firefly-iii"
"/Vault/data/radicale"
"/Vault/data/matrix-synapse"
"/Vault/Eternor/Paperless" "/Vault/Eternor/Paperless"
"/Vault/Eternor/Bilder" "/Vault/Eternor/Bilder"
"/Vault/Eternor/Immich" "/Vault/Eternor/Immich"