mirror of
				https://github.com/Stunkymonkey/nixos.git
				synced 2025-10-31 17:52:10 +01:00 
			
		
		
		
	Compare commits
	
		
			No commits in common. "efd88fb11bb26af4dabbfd42bb6d883fd22be99a" and "7481f09d92260336faa9d2b217a5a92f90314ebf" have entirely different histories.
		
	
	
		
			efd88fb11b
			...
			7481f09d92
		
	
		
					 3 changed files with 22 additions and 9 deletions
				
			
		|  | @ -128,11 +128,7 @@ in | ||||||
|         "/home/*/todo" |         "/home/*/todo" | ||||||
|       ] ++ cfg.exclude; |       ] ++ cfg.exclude; | ||||||
| 
 | 
 | ||||||
|       extraCreateArgs = [ |       extraCreateArgs = "--exclude-caches --keep-exclude-tags --stats"; | ||||||
|         "--exclude-caches" |  | ||||||
|         "--keep-exclude-tags" |  | ||||||
|         "--stats" |  | ||||||
|       ]; |  | ||||||
| 
 | 
 | ||||||
|       encryption = { |       encryption = { | ||||||
|         mode = "repokey-blake2"; |         mode = "repokey-blake2"; | ||||||
|  |  | ||||||
|  | @ -164,10 +164,12 @@ in | ||||||
|             X-Permitted-Cross-Domain-Policies "none" |             X-Permitted-Cross-Domain-Policies "none" | ||||||
|           } |           } | ||||||
| 
 | 
 | ||||||
|           root * ${config.services.nextcloud.finalPackage} |           # TODO: `config.services.nextcloud.package` does not contain additional apps. in nixpkgs there is "nextcloud-with-apps". | ||||||
|  |           # 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.nextcloud.finalPackage} |             root ${config.services.nginx.virtualHosts."cloud.${domain}".root} | ||||||
|             env front_controller_active true |             env front_controller_active true | ||||||
|             env modHeadersAvailable true |             env modHeadersAvailable true | ||||||
|           } |           } | ||||||
|  |  | ||||||
|  | @ -18,9 +18,24 @@ in | ||||||
|     services.rss-bridge = { |     services.rss-bridge = { | ||||||
|       enable = true; |       enable = true; | ||||||
|       config.system.enabled_bridges = [ "*" ]; # Whitelist all |       config.system.enabled_bridges = [ "*" ]; # Whitelist all | ||||||
|       virtualHost = domain; |       virtualHost = null; | ||||||
|       webserver = "caddy"; |       user = "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 = { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue