fixed conflicts

This commit is contained in:
chloe 2025-07-10 19:02:59 +02:00
parent 8cfb304e5c
commit 97094c32b9
6 changed files with 36 additions and 835 deletions

View file

@ -1,4 +1,4 @@
{
{pkgs, ...}:{
services.akkoma.enable = true;
services.akkoma.initDb.enable = true;
services.akkoma.config = {
@ -8,24 +8,29 @@
description = "the cuntiest french akkoma instance<3. centres d'intérêts : la mode, les sciences, la musique. mais ça ne vous empêche pas de parler de n'importe quoi! join us !";
email = "admin@babychou.me";
registration_open = false;
max_pinned_statuses = 1;
};
"Pleroma.Upload".base_url = "https://blurb.rougebordeaux.xyz";
"Pleroma.Web.Endpoint" = {
http.ip = "127.0.0.1";
http.port = 4000;
url.host = "eepy.rougebordeaux.xyz";
};
"Pleroma.Captcha.Kocaptcha" = {
endpoint = "https://captcha.kotobank.ch";
};
"Pleroma.Upload" = {
base_url = "https://blurb.rougebordeaux.xyz/media";
link_name = true;
filters = map (pkgs.formats.elixirConf { }).lib.mkRaw [
"Pleroma.Upload.Filter.Exiftool"
"Pleroma.Upload.Filter.Dedupe"
"Pleroma.Upload.Filter.AnonymizeFilename"
];
};
":configurable_from_database" = true;
};
};
services.caddy.virtualHosts."http://blurb.rougebordeaux.xyz".extraConfig = ''
log {
output file /var/log/caddy/akkoma-blurb.log
}
encode gzip
reverse_proxy :4000
'';
services.caddy.virtualHosts."http://eepy.rougebordeaux.xyz".extraConfig = ''
log {
output file /var/log/caddy/akkoma.log
@ -33,6 +38,15 @@
encode gzip
reverse_proxy :4000
reverse_proxy 127.0.0.1:4000
'';
services.caddy.virtualHosts."http://blurb.rougebordeaux.xyz".extraConfig = ''
log {
output file /var/log/caddy/akkoma_media.log
}
encode gzip
reverse_proxy 127.0.0.1:4000
'';
}

View file

@ -3,7 +3,7 @@
environment.systemPackages = with pkgs; [ ircdHybrid ];
services.ircdHybrid = {
enable = true;
enable = false;
serverName = "irc.rougebordeaux.xyz";
description = "welcome to the silly kittens hut !! meow:3";
adminEmail = "admin@rougebordeaux.xyz";

View file

@ -15,12 +15,12 @@
./nextcloud-network.nix
]; # adding caddy support
sops.secrets.adminNextcloudPass = {
owner = "nextcloud";
};
# sops.secrets.adminNextcloudPass = {
# owner = "nextcloud";
# };
services.nextcloud = {
enable = true;
enable = false;
hostName = "cloud.rougebordeaux.xyz";
database.createLocally = true;
webserver = "caddy";

View file

@ -4,16 +4,16 @@
services.uptime-kuma = {
enable = true;
settings = {
PORT = "4000";
PORT = "4321";
};
};
services.caddy.virtualHosts."http://status.rougebordeaux.xyz".extraConfig = ''
reverse_proxy :4000
reverse_proxy :4321
'';
services.caddy.virtualHosts."http://uptime.sisyphe.normandy.rougebordeaux.xyz".extraConfig = ''
reverse_proxy :4000
reverse_proxy :4321
'';
}