From 1a3051eb4a391f30c16e15b2b02c40d7c0c76f23 Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 29 Nov 2023 21:59:18 -0500 Subject: [PATCH] remove nightly only feature, small housekeeping stuff Signed-off-by: strawberry --- CODE_OF_CONDUCT.md | 2 +- Cargo.toml | 2 -- DEPLOY.md | 2 +- LICENSE | 26 ++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1b060350..a8682537 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,7 +61,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement over email at -coc@koesters.xyz or over Matrix at @timo:conduit.rs. +strawberry@puppygock.gay or over Matrix at @strawberry:puppygock.gay. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/Cargo.toml b/Cargo.toml index b1d8897a..2731e5a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["profile-rustflags"] - [package] name = "conduwuit" description = "a cool fork of Conduit, a Matrix homeserver written in Rust" diff --git a/DEPLOY.md b/DEPLOY.md index 74d4bbaa..65b814a2 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -69,7 +69,7 @@ target. git clone https://gitlab.com/famedly/conduit.git cd conduit export RUSTFLAGS='-C link-arg=-lgcc -Clink-arg=-latomic -Clink-arg=-static-libgcc' -cross build --release --no-default-features --features conduit_bin,backend_rocksdb,jemalloc --target=arm-unknown-linux-gnueabihf +cross build --release --no-default-features --features conduit_bin,backend_rocksdb --target=arm-unknown-linux-gnueabihf ``` diff --git a/LICENSE b/LICENSE index d9a10c0d..a2b8feec 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -174,3 +175,28 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 June + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.