matrix-appservice-discord: init at 0.5.2 (#62744)
* matrix-appservice-discord: init at 0.5.2 * nixos/matrix-appservice-discord: add module
This commit is contained in:
parent
2a9dadfdae
commit
523743157a
|
@ -462,6 +462,7 @@
|
||||||
./services/misc/lidarr.nix
|
./services/misc/lidarr.nix
|
||||||
./services/misc/mame.nix
|
./services/misc/mame.nix
|
||||||
./services/misc/mathics.nix
|
./services/misc/mathics.nix
|
||||||
|
./services/misc/matrix-appservice-discord.nix
|
||||||
./services/misc/matrix-synapse.nix
|
./services/misc/matrix-synapse.nix
|
||||||
./services/misc/mbpfan.nix
|
./services/misc/mbpfan.nix
|
||||||
./services/misc/mediatomb.nix
|
./services/misc/mediatomb.nix
|
||||||
|
|
|
@ -0,0 +1,162 @@
|
||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
dataDir = "/var/lib/matrix-appservice-discord";
|
||||||
|
registrationFile = "${dataDir}/discord-registration.yaml";
|
||||||
|
appDir = "${pkgs.matrix-appservice-discord}/lib/node_modules/matrix-appservice-discord";
|
||||||
|
cfg = config.services.matrix-appservice-discord;
|
||||||
|
# TODO: switch to configGen.json once RFC42 is implemented
|
||||||
|
settingsFile = pkgs.writeText "matrix-appservice-discord-settings.json" (builtins.toJSON cfg.settings);
|
||||||
|
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
services.matrix-appservice-discord = {
|
||||||
|
enable = mkEnableOption "a bridge between Matrix and Discord";
|
||||||
|
|
||||||
|
settings = mkOption rec {
|
||||||
|
# TODO: switch to types.config.json as prescribed by RFC42 once it's implemented
|
||||||
|
type = types.attrs;
|
||||||
|
apply = recursiveUpdate default;
|
||||||
|
default = {
|
||||||
|
database = {
|
||||||
|
filename = "${dataDir}/discord.db";
|
||||||
|
|
||||||
|
# TODO: remove those old config keys once the following issues are solved:
|
||||||
|
# * https://github.com/Half-Shot/matrix-appservice-discord/issues/490
|
||||||
|
# * https://github.com/Half-Shot/matrix-appservice-discord/issues/498
|
||||||
|
userStorePath = "${dataDir}/user-store.db";
|
||||||
|
roomStorePath = "${dataDir}/room-store.db";
|
||||||
|
};
|
||||||
|
|
||||||
|
# empty values necessary for registration file generation
|
||||||
|
# actual values defined in environmentFile
|
||||||
|
auth = {
|
||||||
|
clientID = "";
|
||||||
|
botToken = "";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
example = literalExample ''
|
||||||
|
{
|
||||||
|
bridge = {
|
||||||
|
domain = "public-domain.tld";
|
||||||
|
homeserverUrl = "http://public-domain.tld:8008";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
<filename>config.yaml</filename> configuration as a Nix attribute set.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
<para>
|
||||||
|
Configuration options should match those described in
|
||||||
|
<link xlink:href="https://github.com/Half-Shot/matrix-appservice-discord/blob/master/config/config.sample.yaml">
|
||||||
|
config.sample.yaml</link>.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
<para>
|
||||||
|
<option>config.bridge.domain</option> and <option>config.bridge.homeserverUrl</option>
|
||||||
|
should be set to match the public host name of the Matrix homeserver for webhooks and avatars to work.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
<para>
|
||||||
|
Secret tokens should be specified using <option>environmentFile</option>
|
||||||
|
instead of this world-readable attribute set.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
environmentFile = mkOption {
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
File containing environment variables to be passed to the matrix-appservice-discord service,
|
||||||
|
in which secret tokens can be specified securely by defining values for
|
||||||
|
<literal>APPSERVICE_DISCORD_AUTH_CLIENT_I_D</literal> and
|
||||||
|
<literal>APPSERVICE_DISCORD_AUTH_BOT_TOKEN</literal>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
url = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "http://localhost:${toString cfg.port}";
|
||||||
|
description = ''
|
||||||
|
The URL where the application service is listening for HS requests.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
port = mkOption {
|
||||||
|
type = types.port;
|
||||||
|
default = 9005; # from https://github.com/Half-Shot/matrix-appservice-discord/blob/master/package.json#L11
|
||||||
|
description = ''
|
||||||
|
Port number on which the bridge should listen for internal communication with the Matrix homeserver.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
localpart = mkOption {
|
||||||
|
type = with types; nullOr str;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
The user_id localpart to assign to the AS.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceDependencies = mkOption {
|
||||||
|
type = with types; listOf str;
|
||||||
|
default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
|
||||||
|
description = ''
|
||||||
|
List of Systemd services to require and wait for when starting the application service,
|
||||||
|
such as the Matrix homeserver if it's running on the same host.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
systemd.services.matrix-appservice-discord = {
|
||||||
|
description = "A bridge between Matrix and Discord.";
|
||||||
|
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
|
||||||
|
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
|
||||||
|
|
||||||
|
preStart = ''
|
||||||
|
if [ ! -f '${registrationFile}' ]; then
|
||||||
|
${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \
|
||||||
|
--generate-registration \
|
||||||
|
--url=${escapeShellArg cfg.url} \
|
||||||
|
${optionalString (cfg.localpart != null) "--localpart=${escapeShellArg cfg.localpart}"} \
|
||||||
|
--config='${settingsFile}' \
|
||||||
|
--file='${registrationFile}'
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "simple";
|
||||||
|
Restart = "always";
|
||||||
|
|
||||||
|
ProtectSystem = "strict";
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
|
||||||
|
DynamicUser = true;
|
||||||
|
PrivateTmp = true;
|
||||||
|
WorkingDirectory = appDir;
|
||||||
|
StateDirectory = baseNameOf dataDir;
|
||||||
|
UMask = 0027;
|
||||||
|
EnvironmentFile = cfg.environmentFile;
|
||||||
|
|
||||||
|
ExecStart = ''
|
||||||
|
${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \
|
||||||
|
--file='${registrationFile}' \
|
||||||
|
--config='${settingsFile}' \
|
||||||
|
--port='${toString cfg.port}'
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta.maintainers = with maintainers; [ pacien ];
|
||||||
|
}
|
|
@ -0,0 +1,29 @@
|
||||||
|
{ pkgs, nodejs, stdenv }:
|
||||||
|
|
||||||
|
let
|
||||||
|
nodePackages = import ./node-composition.nix {
|
||||||
|
inherit pkgs nodejs;
|
||||||
|
inherit (stdenv.hostPlatform) system;
|
||||||
|
};
|
||||||
|
|
||||||
|
in nodePackages."matrix-appservice-discord-git+https://github.com/Half-Shot/matrix-appservice-discord.git#v0.5.2".override {
|
||||||
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
# compile Typescript sources
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
# server wrapper
|
||||||
|
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-discord" \
|
||||||
|
--add-flags "$out/lib/node_modules/matrix-appservice-discord/build/src/discordas.js"
|
||||||
|
|
||||||
|
# admin tools wrappers
|
||||||
|
for toolPath in $out/lib/node_modules/matrix-appservice-discord/build/tools/*; do
|
||||||
|
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-discord-$(basename $toolPath .js)" \
|
||||||
|
--add-flags "$toolPath"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
# other metadata generated and inherited from ./node-package.nix
|
||||||
|
meta.maintainers = with stdenv.lib.maintainers; [ pacien ];
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
##!/usr/bin/env nix-shell
|
||||||
|
##! nix-shell -i bash -p nodePackages.node2nix
|
||||||
|
|
||||||
|
node2nix \
|
||||||
|
--nodejs-12 \
|
||||||
|
--node-env ../../development/node-packages/node-env.nix \
|
||||||
|
--development \
|
||||||
|
--input package.json \
|
||||||
|
--output node-packages.nix \
|
||||||
|
--composition node-composition.nix
|
|
@ -0,0 +1,17 @@
|
||||||
|
# This file has been generated by node2nix 1.8.0. Do not edit!
|
||||||
|
|
||||||
|
{pkgs ? import <nixpkgs> {
|
||||||
|
inherit system;
|
||||||
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
||||||
|
|
||||||
|
let
|
||||||
|
nodeEnv = import ../../development/node-packages/node-env.nix {
|
||||||
|
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
|
||||||
|
inherit nodejs;
|
||||||
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
import ./node-packages.nix {
|
||||||
|
inherit (pkgs) fetchurl fetchgit;
|
||||||
|
inherit nodeEnv;
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,3 @@
|
||||||
|
[
|
||||||
|
{ "matrix-appservice-discord": "git+https://github.com/Half-Shot/matrix-appservice-discord.git#v0.5.2" }
|
||||||
|
]
|
|
@ -4708,6 +4708,8 @@ in
|
||||||
|
|
||||||
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {};
|
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {};
|
||||||
|
|
||||||
|
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
|
||||||
|
|
||||||
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
|
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
|
||||||
|
|
||||||
mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
|
mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
|
||||||
|
|
Loading…
Reference in New Issue