flora-6: merge main branch #178

Merged
teutat3s merged 12 commits from flora-6/merge-main into infra 2023-03-08 17:32:29 +00:00
Showing only changes of commit f9e70e18dc - Show all commits

View file

@ -10,6 +10,10 @@
config.services.caddy.configFile
];
systemd.tmpfiles.rules = [
"d '/data/srv/www/os/download/' 0750 hakkonaut hakkonaut - -"
];
services.caddy = {
enable = lib.mkForce true;
group = "hakkonaut";
@ -23,7 +27,7 @@
extraConfig = ''
# PubSolarOS images
handle /os/download/* {
root * /srv/www
root * /data/srv/www
file_server /os/download/* browse
}
# serve base domain pub.solar for mastodon.pub.solar