nixos: move matrix services into their category
This commit is contained in:
parent
046d0253aa
commit
22f3d4e4db
|
@ -515,9 +515,15 @@
|
||||||
./services/mail/roundcube.nix
|
./services/mail/roundcube.nix
|
||||||
./services/mail/sympa.nix
|
./services/mail/sympa.nix
|
||||||
./services/mail/nullmailer.nix
|
./services/mail/nullmailer.nix
|
||||||
./services/matrix/matrix-synapse.nix
|
./services/matrix/appservice-discord.nix
|
||||||
|
./services/matrix/appservice-irc.nix
|
||||||
|
./services/matrix/conduit.nix
|
||||||
|
./services/matrix/dendrite.nix
|
||||||
|
./services/matrix/mautrix-facebook.nix
|
||||||
|
./services/matrix/mautrix-telegram.nix
|
||||||
./services/matrix/mjolnir.nix
|
./services/matrix/mjolnir.nix
|
||||||
./services/matrix/pantalaimon.nix
|
./services/matrix/pantalaimon.nix
|
||||||
|
./services/matrix/synapse.nix
|
||||||
./services/misc/ananicy.nix
|
./services/misc/ananicy.nix
|
||||||
./services/misc/airsonic.nix
|
./services/misc/airsonic.nix
|
||||||
./services/misc/ankisyncd.nix
|
./services/misc/ankisyncd.nix
|
||||||
|
@ -536,7 +542,6 @@
|
||||||
./services/misc/cpuminer-cryptonight.nix
|
./services/misc/cpuminer-cryptonight.nix
|
||||||
./services/misc/cgminer.nix
|
./services/misc/cgminer.nix
|
||||||
./services/misc/confd.nix
|
./services/misc/confd.nix
|
||||||
./services/misc/dendrite.nix
|
|
||||||
./services/misc/devmon.nix
|
./services/misc/devmon.nix
|
||||||
./services/misc/dictd.nix
|
./services/misc/dictd.nix
|
||||||
./services/misc/duckling.nix
|
./services/misc/duckling.nix
|
||||||
|
@ -579,11 +584,6 @@
|
||||||
./services/misc/libreddit.nix
|
./services/misc/libreddit.nix
|
||||||
./services/misc/lifecycled.nix
|
./services/misc/lifecycled.nix
|
||||||
./services/misc/mame.nix
|
./services/misc/mame.nix
|
||||||
./services/misc/matrix-appservice-discord.nix
|
|
||||||
./services/misc/matrix-appservice-irc.nix
|
|
||||||
./services/misc/matrix-conduit.nix
|
|
||||||
./services/misc/mautrix-facebook.nix
|
|
||||||
./services/misc/mautrix-telegram.nix
|
|
||||||
./services/misc/mbpfan.nix
|
./services/misc/mbpfan.nix
|
||||||
./services/misc/mediatomb.nix
|
./services/misc/mediatomb.nix
|
||||||
./services/misc/metabase.nix
|
./services/misc/metabase.nix
|
||||||
|
|
|
@ -285,7 +285,7 @@ in {
|
||||||
|
|
||||||
log_config = mkOption {
|
log_config = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
default = ./matrix-synapse-log_config.yaml;
|
default = ./synapse-log_config.yaml;
|
||||||
description = ''
|
description = ''
|
||||||
The file that holds the logging configuration.
|
The file that holds the logging configuration.
|
||||||
'';
|
'';
|
||||||
|
@ -767,7 +767,7 @@ in {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
buildDocsInSandbox = false;
|
buildDocsInSandbox = false;
|
||||||
doc = ./matrix-synapse.xml;
|
doc = ./synapse.xml;
|
||||||
maintainers = teams.matrix.members;
|
maintainers = teams.matrix.members;
|
||||||
};
|
};
|
||||||
|
|
|
@ -126,7 +126,7 @@ let
|
||||||
croc = handleTest ./croc.nix {};
|
croc = handleTest ./croc.nix {};
|
||||||
cryptpad = handleTest ./cryptpad.nix {};
|
cryptpad = handleTest ./cryptpad.nix {};
|
||||||
deluge = handleTest ./deluge.nix {};
|
deluge = handleTest ./deluge.nix {};
|
||||||
dendrite = handleTest ./dendrite.nix {};
|
dendrite = handleTest ./matrix/dendrite.nix {};
|
||||||
dex-oidc = handleTest ./dex-oidc.nix {};
|
dex-oidc = handleTest ./dex-oidc.nix {};
|
||||||
dhparams = handleTest ./dhparams.nix {};
|
dhparams = handleTest ./dhparams.nix {};
|
||||||
disable-installer-tools = handleTest ./disable-installer-tools.nix {};
|
disable-installer-tools = handleTest ./disable-installer-tools.nix {};
|
||||||
|
@ -315,9 +315,9 @@ let
|
||||||
mariadb-galera = handleTest ./mysql/mariadb-galera.nix {};
|
mariadb-galera = handleTest ./mysql/mariadb-galera.nix {};
|
||||||
mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {};
|
mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {};
|
||||||
matomo = handleTest ./matomo.nix {};
|
matomo = handleTest ./matomo.nix {};
|
||||||
matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {};
|
matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {};
|
||||||
matrix-conduit = handleTest ./matrix-conduit.nix {};
|
matrix-conduit = handleTest ./matrix/conduit.nix {};
|
||||||
matrix-synapse = handleTest ./matrix-synapse.nix {};
|
matrix-synapse = handleTest ./matrix/synapse.nix {};
|
||||||
mattermost = handleTest ./mattermost.nix {};
|
mattermost = handleTest ./mattermost.nix {};
|
||||||
mediatomb = handleTest ./mediatomb.nix {};
|
mediatomb = handleTest ./mediatomb.nix {};
|
||||||
mediawiki = handleTest ./mediawiki.nix {};
|
mediawiki = handleTest ./mediawiki.nix {};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import ./make-test-python.nix ({ pkgs, ... }:
|
import ../make-test-python.nix ({ pkgs, ... }:
|
||||||
let
|
let
|
||||||
homeserverUrl = "http://homeserver:8008";
|
homeserverUrl = "http://homeserver:8008";
|
||||||
in
|
in
|
|
@ -1,4 +1,4 @@
|
||||||
import ./make-test-python.nix ({ pkgs, ... }:
|
import ../make-test-python.nix ({ pkgs, ... }:
|
||||||
let
|
let
|
||||||
name = "conduit";
|
name = "conduit";
|
||||||
in
|
in
|
|
@ -1,4 +1,4 @@
|
||||||
import ./make-test-python.nix (
|
import ../make-test-python.nix (
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
homeserverUrl = "http://homeserver:8008";
|
homeserverUrl = "http://homeserver:8008";
|
|
@ -1,4 +1,4 @@
|
||||||
import ./make-test-python.nix ({ pkgs, ... } : let
|
import ../make-test-python.nix ({ pkgs, ... } : let
|
||||||
|
|
||||||
|
|
||||||
runWithOpenSSL = file: cmd: pkgs.runCommand file {
|
runWithOpenSSL = file: cmd: pkgs.runCommand file {
|
||||||
|
@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
mailerCerts = import ./common/acme/server/snakeoil-certs.nix;
|
mailerCerts = import ../common/acme/server/snakeoil-certs.nix;
|
||||||
mailerDomain = mailerCerts.domain;
|
mailerDomain = mailerCerts.domain;
|
||||||
registrationSharedSecret = "unsecure123";
|
registrationSharedSecret = "unsecure123";
|
||||||
testUser = "alice";
|
testUser = "alice";
|
Loading…
Reference in a new issue