From 9ead8e453e25799a9905170cec57c53deb13f2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Fri, 13 May 2022 16:46:01 +0900 Subject: [PATCH] nixos: move matrix services into their category --- nixos/modules/module-list.nix | 14 +++++++------- .../appservice-discord.nix} | 0 .../appservice-irc.nix} | 0 .../matrix-conduit.nix => matrix/conduit.nix} | 0 .../modules/services/{misc => matrix}/dendrite.nix | 0 .../services/{misc => matrix}/mautrix-facebook.nix | 0 .../services/{misc => matrix}/mautrix-telegram.nix | 0 ...pse-log_config.yaml => synapse-log_config.yaml} | 0 .../matrix/{matrix-synapse.nix => synapse.nix} | 4 ++-- .../matrix/{matrix-synapse.xml => synapse.xml} | 0 nixos/tests/all-tests.nix | 8 ++++---- .../appservice-irc.nix} | 2 +- .../{matrix-conduit.nix => matrix/conduit.nix} | 2 +- nixos/tests/{ => matrix}/dendrite.nix | 2 +- .../{matrix-synapse.nix => matrix/synapse.nix} | 4 ++-- 15 files changed, 18 insertions(+), 18 deletions(-) rename nixos/modules/services/{misc/matrix-appservice-discord.nix => matrix/appservice-discord.nix} (100%) rename nixos/modules/services/{misc/matrix-appservice-irc.nix => matrix/appservice-irc.nix} (100%) rename nixos/modules/services/{misc/matrix-conduit.nix => matrix/conduit.nix} (100%) rename nixos/modules/services/{misc => matrix}/dendrite.nix (100%) rename nixos/modules/services/{misc => matrix}/mautrix-facebook.nix (100%) rename nixos/modules/services/{misc => matrix}/mautrix-telegram.nix (100%) rename nixos/modules/services/matrix/{matrix-synapse-log_config.yaml => synapse-log_config.yaml} (100%) rename nixos/modules/services/matrix/{matrix-synapse.nix => synapse.nix} (99%) rename nixos/modules/services/matrix/{matrix-synapse.xml => synapse.xml} (100%) rename nixos/tests/{matrix-appservice-irc.nix => matrix/appservice-irc.nix} (99%) rename nixos/tests/{matrix-conduit.nix => matrix/conduit.nix} (98%) rename nixos/tests/{ => matrix}/dendrite.nix (99%) rename nixos/tests/{matrix-synapse.nix => matrix/synapse.nix} (98%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d67602a26761..495be43ec561 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -516,9 +516,15 @@ ./services/mail/roundcube.nix ./services/mail/sympa.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/pantalaimon.nix + ./services/matrix/synapse.nix ./services/misc/ananicy.nix ./services/misc/airsonic.nix ./services/misc/ankisyncd.nix @@ -537,7 +543,6 @@ ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix - ./services/misc/dendrite.nix ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/duckling.nix @@ -580,11 +585,6 @@ ./services/misc/libreddit.nix ./services/misc/lifecycled.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/mediatomb.nix ./services/misc/metabase.nix diff --git a/nixos/modules/services/misc/matrix-appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix similarity index 100% rename from nixos/modules/services/misc/matrix-appservice-discord.nix rename to nixos/modules/services/matrix/appservice-discord.nix diff --git a/nixos/modules/services/misc/matrix-appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix similarity index 100% rename from nixos/modules/services/misc/matrix-appservice-irc.nix rename to nixos/modules/services/matrix/appservice-irc.nix diff --git a/nixos/modules/services/misc/matrix-conduit.nix b/nixos/modules/services/matrix/conduit.nix similarity index 100% rename from nixos/modules/services/misc/matrix-conduit.nix rename to nixos/modules/services/matrix/conduit.nix diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix similarity index 100% rename from nixos/modules/services/misc/dendrite.nix rename to nixos/modules/services/matrix/dendrite.nix diff --git a/nixos/modules/services/misc/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix similarity index 100% rename from nixos/modules/services/misc/mautrix-facebook.nix rename to nixos/modules/services/matrix/mautrix-facebook.nix diff --git a/nixos/modules/services/misc/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix similarity index 100% rename from nixos/modules/services/misc/mautrix-telegram.nix rename to nixos/modules/services/matrix/mautrix-telegram.nix diff --git a/nixos/modules/services/matrix/matrix-synapse-log_config.yaml b/nixos/modules/services/matrix/synapse-log_config.yaml similarity index 100% rename from nixos/modules/services/matrix/matrix-synapse-log_config.yaml rename to nixos/modules/services/matrix/synapse-log_config.yaml diff --git a/nixos/modules/services/matrix/matrix-synapse.nix b/nixos/modules/services/matrix/synapse.nix similarity index 99% rename from nixos/modules/services/matrix/matrix-synapse.nix rename to nixos/modules/services/matrix/synapse.nix index 87a977f8e1ef..b3108484fae1 100644 --- a/nixos/modules/services/matrix/matrix-synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -285,7 +285,7 @@ in { log_config = mkOption { type = types.path; - default = ./matrix-synapse-log_config.yaml; + default = ./synapse-log_config.yaml; description = '' The file that holds the logging configuration. ''; @@ -767,7 +767,7 @@ in { meta = { buildDocsInSandbox = false; - doc = ./matrix-synapse.xml; + doc = ./synapse.xml; maintainers = teams.matrix.members; }; diff --git a/nixos/modules/services/matrix/matrix-synapse.xml b/nixos/modules/services/matrix/synapse.xml similarity index 100% rename from nixos/modules/services/matrix/matrix-synapse.xml rename to nixos/modules/services/matrix/synapse.xml diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6d2525732da0..38c320886d1a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -112,7 +112,7 @@ in { croc = handleTest ./croc.nix {}; cryptpad = handleTest ./cryptpad.nix {}; deluge = handleTest ./deluge.nix {}; - dendrite = handleTest ./dendrite.nix {}; + dendrite = handleTest ./matrix/dendrite.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; @@ -301,9 +301,9 @@ in { mariadb-galera = handleTest ./mysql/mariadb-galera.nix {}; mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {}; matomo = handleTest ./matomo.nix {}; - matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {}; - matrix-conduit = handleTest ./matrix-conduit.nix {}; - matrix-synapse = handleTest ./matrix-synapse.nix {}; + matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; + matrix-conduit = handleTest ./matrix/conduit.nix {}; + matrix-synapse = handleTest ./matrix/synapse.nix {}; mattermost = handleTest ./mattermost.nix {}; mediatomb = handleTest ./mediatomb.nix {}; mediawiki = handleTest ./mediawiki.nix {}; diff --git a/nixos/tests/matrix-appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix similarity index 99% rename from nixos/tests/matrix-appservice-irc.nix rename to nixos/tests/matrix/appservice-irc.nix index 70d458523986..7dd44da8305e 100644 --- a/nixos/tests/matrix-appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; in diff --git a/nixos/tests/matrix-conduit.nix b/nixos/tests/matrix/conduit.nix similarity index 98% rename from nixos/tests/matrix-conduit.nix rename to nixos/tests/matrix/conduit.nix index d159fbaa4800..780837f962fa 100644 --- a/nixos/tests/matrix-conduit.nix +++ b/nixos/tests/matrix/conduit.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, ... }: let name = "conduit"; in diff --git a/nixos/tests/dendrite.nix b/nixos/tests/matrix/dendrite.nix similarity index 99% rename from nixos/tests/dendrite.nix rename to nixos/tests/matrix/dendrite.nix index 1ff415433b47..82e71d912130 100644 --- a/nixos/tests/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix/synapse.nix similarity index 98% rename from nixos/tests/matrix-synapse.nix rename to nixos/tests/matrix/synapse.nix index 1ff1e47b2840..756a8d5de49a 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... } : let +import ../make-test-python.nix ({ pkgs, ... } : let 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; registrationSharedSecret = "unsecure123"; testUser = "alice";