remove conduwuit because it has been archived
This commit is contained in:
parent
d64679dbfe
commit
d5adaf015c
4 changed files with 21 additions and 113 deletions
|
|
@ -25,11 +25,6 @@
|
|||
};
|
||||
openssh.enable = true;
|
||||
tailscale.enable = true;
|
||||
# conduwuit = {
|
||||
# enable = true;
|
||||
# serverName = "im.youthlic.fun";
|
||||
# };
|
||||
mautrix-telegram.enable = true;
|
||||
caddy = {
|
||||
enable = true;
|
||||
baseDomain = "youthlic.fun";
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.youthlic.programs.conduwuit;
|
||||
in {
|
||||
options = {
|
||||
youthlic.programs.conduwuit = {
|
||||
enable = lib.mkEnableOption "conduwuit";
|
||||
serverName = lib.mkOption {
|
||||
type = lib.types.nonEmptyStr;
|
||||
example = "example.com";
|
||||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf cfg.enable {
|
||||
sops.secrets."matrix-reg-token" = {
|
||||
owner = "conduwuit";
|
||||
};
|
||||
systemd.services.conduwuit.serviceConfig = {
|
||||
EnvironmentFile = "${config.sops.secrets.matrix-reg-token.path}";
|
||||
};
|
||||
services.conduwuit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
port = [8481];
|
||||
address = [
|
||||
"0.0.0.0"
|
||||
"::"
|
||||
];
|
||||
trusted_servers = [
|
||||
"matrix.org"
|
||||
"mozilla.org"
|
||||
"nichi.co"
|
||||
];
|
||||
allow_registration = true;
|
||||
server_name = cfg.serverName;
|
||||
new_user_displayname_suffix = "⚡";
|
||||
allow_public_room_directory_over_federation = true;
|
||||
well_known = {
|
||||
client = "https://${cfg.serverName}";
|
||||
server = "${cfg.serverName}:443";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
(lib.mkIf (cfg.enable && config.youthlic.programs.caddy.enable) {
|
||||
services.caddy.virtualHosts = {
|
||||
"${cfg.serverName}" = {
|
||||
extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:8481
|
||||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -19,7 +19,6 @@
|
|||
./steam.nix
|
||||
./tailscale.nix
|
||||
./transmission.nix
|
||||
./conduwuit.nix
|
||||
./nix-ld.nix
|
||||
./juicity
|
||||
./miniflux.nix
|
||||
|
|
|
|||
|
|
@ -10,54 +10,29 @@ in {
|
|||
enable = lib.mkEnableOption "mautrix-telegram";
|
||||
};
|
||||
};
|
||||
config = let
|
||||
conduwuit-cfg = config.youthlic.programs.conduwuit;
|
||||
caddy-cfg = config.youthlic.programs.caddy;
|
||||
in
|
||||
lib.mkMerge [
|
||||
(lib.mkIf cfg.enable {
|
||||
sops.secrets.matrix-telegram-bot = {};
|
||||
services.mautrix-telegram = {
|
||||
enable = true;
|
||||
environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}";
|
||||
settings = {
|
||||
bridge = {
|
||||
permissions = {
|
||||
"*" = "relaybot";
|
||||
};
|
||||
};
|
||||
appservice = {
|
||||
address = "http://127.0.0.1:8482";
|
||||
hostname = "0.0.0.0";
|
||||
port = 8482;
|
||||
database = "sqlite:////var/lib/mautrix-telegram/database.db";
|
||||
bot_username = "matrix_tg_146bot";
|
||||
bot_displayname = "matrix tg bridge";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
sops.secrets.matrix-telegram-bot = {};
|
||||
services.mautrix-telegram = {
|
||||
enable = true;
|
||||
environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}";
|
||||
settings = {
|
||||
bridge = {
|
||||
permissions = {
|
||||
"*" = "relaybot";
|
||||
};
|
||||
};
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
})
|
||||
(lib.mkIf (cfg.enable && conduwuit-cfg.enable) {
|
||||
services.mautrix-telegram = {
|
||||
serviceDependencies = [
|
||||
"conduwuit.service"
|
||||
];
|
||||
settings = {
|
||||
bridge = {
|
||||
permissions = {
|
||||
"${conduwuit-cfg.serverName}" = "full";
|
||||
"@youthlic:${conduwuit-cfg.serverName}" = "admin";
|
||||
};
|
||||
};
|
||||
homeserver = {
|
||||
domain = conduwuit-cfg.serverName;
|
||||
address = "http://127.0.0.1:8481";
|
||||
};
|
||||
};
|
||||
appservice = {
|
||||
address = "http://127.0.0.1:8482";
|
||||
hostname = "0.0.0.0";
|
||||
port = 8482;
|
||||
database = "sqlite:////var/lib/mautrix-telegram/database.db";
|
||||
bot_username = "matrix_tg_146bot";
|
||||
bot_displayname = "matrix tg bridge";
|
||||
};
|
||||
})
|
||||
};
|
||||
};
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue