Fixed caddy RP and moved caddy config to manage by home-manager

This commit is contained in:
2025-02-04 00:46:01 +00:00
parent be6fbe8a63
commit dba11329a2
7 changed files with 24 additions and 4 deletions

View File

@@ -20,8 +20,9 @@
volumes = [
"/home/cianh/caddy/config:/etc/caddy"
"/home/cianh/caddy/data:/data:Z"
# "/home/cianh/caddy/placeholder_site/:/srv:ro"
];
};
};
home.file."caddy/config/Caddyfile".source = ./caddy_config/Caddyfile;
}

View File

@@ -0,0 +1,5 @@
{
admin off
}
import subdomains/*

View File

@@ -0,0 +1,3 @@
freshrss.bulba.space {
reverse_proxy freshrss:80
}

View File

@@ -0,0 +1,3 @@
bulba.space {
reverse_proxy bulbaspace-site:80
}

View File

@@ -0,0 +1,3 @@
vikunja.bulba.space {
reverse_proxy vikunja:3456
}

View File

@@ -17,4 +17,6 @@
];
};
};
home.file."caddy/config/subdomains/site.caddyfile".source = ./caddy_config/subdomains/site.caddyfile;
}

View File

@@ -21,9 +21,9 @@
];
environment = {
VIKUNJA_SERVICE_JWTSECRET = config.sops.secrets.vikunja_jwtsecret.path;
VIKUNJA_SERVICE_PUBLICURL = "https://bulba.space/vikunja";
VIKUNJA_SERVICE_PUBLICURL = "https://vikunja.bulba.space";
VIKUNJA_FRONTEND_BASE = "/vikunja";
VIKUNJA_SERVICE_FRONTENDURL = "https://bulba.space/vikunja";
VIKUNJA_SERVICE_FRONTENDURL = "https://vikunja.bulba.space";
VIKUNJA_DATABASE_PATH = "/db/vikunja.db";
VIKUNJA_DATABASE_TYPE = "mysql";
VIKUNJA_DATABASE_DATABASE = "vikunja";
@@ -65,7 +65,7 @@
TZ = "Europe/Dublin";
CRON_MIN = "1,31";
TRUSTED_PROXY = "caddy";
FRESHRSS_SUBFOLDER = "/freshrss";
FRESHRSS_ENV = "production";
};
volumes = [
"/home/cianh/freshrss/data:/var/www/FreshRSS/data"
@@ -78,4 +78,7 @@
};
};
};
home.file."caddy/config/subdomains/vikunja.caddyfile".source = ./caddy_config/subdomains/vikunja.caddyfile;
home.file."caddy/config/subdomains/freshrss.caddyfile".source = ./caddy_config/subdomains/freshrss.caddyfile;
}