felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-10-31 09:42:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: felix:7481f09d92260336faa9d2b217a5a92f90314ebf
Branches Tags
felix:master
felix:nixos-23.11
...
compare: felix:efd88fb11bb26af4dabbfd42bb6d883fd22be99a
Branches Tags
felix:master
felix:nixos-23.11

3 commits
7481f09d92 ... efd88fb11b

Author SHA1 Message Date
Felix Buehler
efd88fb11b service/rss-bridge: use official caddy setting
Some checks are pending
/ Build Nix targets (push) Waiting to run
Details
2025-05-28 00:15:20 +02:00
Felix Buehler
c7b1cd723d service/nextcloud: migrate to finalPackage output 2025-05-28 00:10:51 +02:00
Felix Buehler
f0d997a340 service/backup: pass args as array 2025-05-27 23:58:23 +02:00
3 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/services/backup/default.nix
View file

@ -128,7 +128,11 @@ in
"/home/*/todo" "/home/*/todo"
] ++ cfg.exclude; ] ++ cfg.exclude;
extraCreateArgs = "--exclude-caches --keep-exclude-tags --stats"; extraCreateArgs = [
"--exclude-caches"
"--keep-exclude-tags"
"--stats"
];
encryption = { encryption = {
mode = "repokey-blake2"; mode = "repokey-blake2";

6
modules/services/nextcloud/default.nix
View file

@ -164,12 +164,10 @@ in
X-Permitted-Cross-Domain-Policies "none" X-Permitted-Cross-Domain-Policies "none"
} }
# TODO: `config.services.nextcloud.package` does not contain additional apps. in nixpkgs there is "nextcloud-with-apps". root * ${config.services.nextcloud.finalPackage}
# for now we use the path passed to nginx. Can be improved in 25.05 via: `config.services.nextcloud.finalPackage`
root * ${config.services.nginx.virtualHosts."cloud.${domain}".root}
file_server file_server
php_fastcgi unix/${config.services.phpfpm.pools."nextcloud".socket} { php_fastcgi unix/${config.services.phpfpm.pools."nextcloud".socket} {
root ${config.services.nginx.virtualHosts."cloud.${domain}".root} root ${config.services.nextcloud.finalPackage}
env front_controller_active true env front_controller_active true
env modHeadersAvailable true env modHeadersAvailable true
} }

19
modules/services/rss-bridge/default.nix
View file

@ -18,24 +18,9 @@ in
services.rss-bridge = { services.rss-bridge = {
enable = true; enable = true;
config.system.enabled_bridges = [ "*" ]; # Whitelist all config.system.enabled_bridges = [ "*" ]; # Whitelist all
virtualHost = null; virtualHost = domain;
user = "caddy"; webserver = "caddy";
group = "caddy";
# TODO: with 25.05 this can be simplified via
# webserver = "caddy";
}; };
my.services.webserver.virtualHosts = [
{
subdomain = "rss-bridge";
extraConfig = ''
root * ${pkgs.rss-bridge}
php_fastcgi unix/${config.services.phpfpm.pools."rss-bridge".socket} {
env RSSBRIDGE_fileCache_path ${config.services.rss-bridge.dataDir}/cache/
}
file_server
'';
}
];
webapps.apps.rss-bridge = { webapps.apps.rss-bridge = {
dashboard = { dashboard = {