switch cargo.toml pkg name back to conduit

we already make it clear this is a fork with our version and such Signed-off-by: strawberry <strawberry@puppygock.gay>
make allow_federation default to true
2024-01-27 16:41:27 -05:00 · 2024-01-27 16:28:57 -05:00 · 2024-01-27 16:27:00 -05:00 · 2024-01-27 09:08:33 -05:00
7 changed files with 16 additions and 13 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -382,7 +382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"

 [[package]]
-name = "conduwuit"
+name = "conduit"
 version = "0.7.0-alpha+conduwuit-0.1.2"
 dependencies = [
 "argon2",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "conduwuit"
+name = "conduit"
 description = "a cool fork of Conduit, a Matrix homeserver written in Rust"
 license = "Apache-2.0"
 authors = ["strawberry <strawberry@puppygock.gay>", "timokoesters <timo@koesters.xyz>"]
--- a/bin/nix-build-and-cache
+++ b/bin/nix-build-and-cache
@ -12,7 +12,7 @@ if [ ! -z ${ATTIC_TOKEN+x} ]; then

 nix run --inputs-from . attic -- login \
    conduit \
-        https://nix.computer.surgery/conduit \
+        https://attic.kennel.girlcock.ceo/conduit \
        "$ATTIC_TOKEN"

    push_args=(
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
@ -133,8 +133,8 @@ allow_registration = false
 registration_token = "change this token for something specific to your server"

 # controls whether federation is allowed or not
-# defaults to false
-allow_federation = true
+# defaults to true
+# allow_federation = true

 # controls whether users are allowed to create rooms.
 # appservices and admins are always allowed to create rooms
--- a/flake.lock
+++ b/flake.lock
@ -73,11 +73,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1706250153,
-        "narHash": "sha256-OwEZ4UMLuz9fpH9ZbN7SSQvtDvUoj3RV32icp+8SIIc=",
+        "lastModified": 1706336364,
+        "narHash": "sha256-mJ5i2YIVKv6jTN2+l3oOUUej2NUVjJX/H3bAq6019ks=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "6d85102211fa954ece0a8a898ed91b4866b62ce7",
+        "rev": "eb683549b7d76b12d1a009f888b91b70ed34485f",
        "type": "github"
      },
      "original": {
@ -211,11 +211,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1706158176,
-        "narHash": "sha256-qPiPcLBXU05j+Z2hCrtClJQfmrfSN/bUq2aODiCzde0=",
+        "lastModified": 1706295183,
+        "narHash": "sha256-VSyMaUsXfjb31B8/uT5cM5qXC1VOHLVsCi/bQuo3O/g=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "38f7a3498e0d5f0113294bbdc08f867cd527e65f",
+        "rev": "596e5c77cf5b2b660b3ac2ce732fa0596c246d9b",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -176,7 +176,10 @@
      mkOciImage = pkgs: package:
        pkgs.dockerTools.buildImage {
          name = package.pname;
-          tag = "latest";
+          tag = "main";
+          copyToRoot = [
+            pkgs.dockerTools.caCertificates
+          ];
          config = {
            # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
            # are handled as expected
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@ -57,7 +57,7 @@ pub struct Config {
    pub registration_token: Option<String>,
    #[serde(default = "true_fn")]
    pub allow_encryption: bool,
-    #[serde(default)]
+    #[serde(default = "true_fn")]
    pub allow_federation: bool,
    #[serde(default)]
    pub allow_public_room_directory_over_federation: bool,
Author	SHA1	Message	Date
strawberry	fc219e621f	switch cargo.toml pkg name back to conduit we already make it clear this is a fork with our version and such Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-01-27 16:41:27 -05:00
strawberry	5de4a41ff5	make allow_federation default to true Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-01-27 16:28:57 -05:00
Charles Hall	c1de446b7b	add ca certificates to the OCI image Without this, checking the authority of TLS certificates fails, making Conduit (rightly) refuse to connect to anything. Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-01-27 16:27:00 -05:00
strawberry	af20166717	use main instead of latest for docker tag Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-01-27 09:08:33 -05:00