wip

Signed-off-by: Magic_RB <magic_rb@redalder.org>

containers/conduit.nix

@@ -78,7 +78,7 @@ nglib.makeSystem {
                   {
                     name = "sqlite3";
                     compress = false;
-                    args.database = "/var/lib/matrix-conduit/synapse/sqlite.db";
+                    args.database = "/var/lib/synapse/sqlite.db";
                   };
                 log_config = logConfig;
                 trusted_key_servers =
@@ -87,82 +87,25 @@ nglib.makeSystem {
                       server_name = "matrix.org";
                     }
                   ];
-                media_store_path = "/var/lib/matrix-conduit/synapse/media_store";
-                signing_key_path = "/var/lib/matrix-conduit/synapse/signing.key";
+                media_store_path = "/var/lib/synapse/media_store";
+                signing_key_path = "/var/lib/synapse/signing.key";
               };
           in
             pkgs.writeShellScript "conduit"
               ''
-                [ -e /var/lib/matrix-conduit/synapse/signing.key ] || \
+                [ -e /var/lib/synapse/signing.key ] || \
                   ${pkgs.matrix-synapse}/bin/synapse_homeserver \
                     --config-path ${synapseConfig} \
                     --config-path /secrets/extra.yaml \
-                    --keys-directory /var/lib/matrix-conduit/synapse/keys \
+                    --config-path /var/lib/registrations/extra.yaml \
+                    --keys-directory /var/lib/synapse/keys \
                     --generate-keys
                 ${pkgs.matrix-synapse}/bin/synapse_homeserver \
                   --config-path ${synapseConfig} \
                   --config-path /secrets/extra.yaml \
-                  --keys-directory /var/lib/matrix-conduit/synapse/keys
+                  --config-path /var/lib/registrations/extra.yaml \
+                  --keys-directory /var/lib/synapse/keys
               '';
       };
     });
-
-    #   init.services.conduit = {
-    #     enabled = true;
-    #     shutdownOnExit = true;
-    #     script =
-    #       let
-    #         conduitConfig = (pkgs.formats.toml {}).generate "conduit.toml"
-    #           {
-    #             global =
-    #               {
-    #                 # The server_name is the pretty name of this server. It is used as a suffix for user
-    #                 # and room ids. Examples: matrix.org, conduit.rs
-
-    #                 # The Conduit server needs all /_matrix/ requests to be reachable at
-    #                 # https://your.server.name/ on port 443 (client-server) and 8448 (federation).
-
-    #                 # If that's not possible for you, you can create /.well-known files to redirect
-    #                 # requests. See
-    #                 # https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
-    #                 # and
-    #                 # https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
-    #                 # for more information
-
-    #                 # YOU NEED TO EDIT THIS
-    #                 server_name = "matrix.redalder.org";
-
-    #                 # This is the only directory where Conduit will save its data
-    #                 database_path = "/var/lib/matrix-conduit/";
-    #                 database_backend = "rocksdb";
-
-    #                 # The port Conduit will be running on. You need to set up a reverse proxy in
-    #                 # your web server (e.g. apache or nginx), so all requests to /_matrix on port
-    #                 # 443 and 8448 will be forwarded to the Conduit instance running on this port
-    #                 port = 6167;
-
-    #                 # Max size for uploads
-    #                 max_request_size = 20000000; # in bytes
-
-    #                 # Enables registration. If set to false, no users can register on this server.
-    #                 allow_registration = true;
-
-    #                 allow_federation = true;
-
-    #                 trusted_servers = ["matrix.org"];
-
-    #                 # How many requests Conduit sends to other servers at the same time
-    #                 #max_concurrent_requests = 100
-    #                 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
-
-    #                 address = "0.0.0.0";
-    #               };
-    #           };
-    #       in
-    #         pkgs.writeShellScript "conduit"
-    #           ''
-    #             CONDUIT_CONFIG=${conduitConfig} ${pkgs.matrix-conduit}/bin/conduit
-    #           '';
-    #   };
-    # });
 }

containers/mautrix-facebook.nix

@@ -21,7 +21,7 @@ nglib.makeSystem {
             ''
               DATA_DIR="/var/lib/mautrix-facebook"
               CONFIG_FILE="$DATA_DIR/config.yaml"
-              REGISTRATION_FILE="$DATA_DIR/registration.yaml"
+              REGISTRATION_FILE="/var/lib/registrations/mautrix-facebook.yaml"
               DB_FILE="$DATA_DIR/sqlite.db"
 
               cp ${config} "$CONFIG_FILE" ; chmod 755 "$CONFIG_FILE"

containers/mautrix-facebook.yaml

@@ -104,7 +104,6 @@ manhole:
 
 # Bridge config
 bridge:
-    env_prefix: "MAUTRIX_FACEBOOK"
     # Localpart template of MXIDs for Facebook users.
     # {userid} is replaced with the user ID of the Facebook user.
     username_template: "facebook_{userid}"