Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strawberry/misc #565

Merged
merged 22 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
119cc2e
fix typo with reqwest builder for disabling zstd
girlbossceo Aug 30, 2024
8d7e5ca
redirect/handle r0 media paths too
girlbossceo Aug 30, 2024
42a42b2
renovate: exclude rust deps we forked / cant easily bump or upgrade
girlbossceo Aug 30, 2024
eaa8997
Update nixos/nix Docker tag to v2.24.4
renovate[bot] Aug 30, 2024
b89d2ce
bump syn, serde, and tokio
girlbossceo Aug 30, 2024
bceed3c
dont debug print startup admin command content body
girlbossceo Aug 30, 2024
ae98610
docs: document new startup `--execute` admin cmd flag/argument
girlbossceo Aug 30, 2024
3a623db
add force_leave_room admin command
girlbossceo Aug 30, 2024
9228754
docs: fix some borked codeblocks
girlbossceo Aug 30, 2024
d68b71a
add appservice ping client endpoint (MSC2659)
girlbossceo Aug 30, 2024
4797183
remove unnecessary loop/allocations in `/joined_members`
girlbossceo Aug 30, 2024
b45df5f
bump appservice requests to v1.7
jevolk Aug 31, 2024
7b85235
deploying: make traefik config self-sufficient, include well known
morguldir Aug 31, 2024
14b9511
fix default capture EnvFilter in release mode
jevolk Aug 31, 2024
5dbb868
remove unnecessary loops/allocations in client `/capabilities`
girlbossceo Aug 31, 2024
bfb10cd
slightly cleanup and simplify client /report endpoint
girlbossceo Aug 31, 2024
5530e74
notify admin room on new room directory publishes
girlbossceo Aug 31, 2024
b362f0e
fix some other markdown formatting
girlbossceo Aug 31, 2024
2fcedad
document ways to recovering admin room access
girlbossceo Sep 1, 2024
fc1834d
use codeblocks instead of HTML tables for some admin commands
girlbossceo Sep 1, 2024
27bfb67
add `--no-details` to admin rooms list command
girlbossceo Sep 1, 2024
60605e9
remove unnecessary loop/allocations on CIDR range init
girlbossceo Sep 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ before_script:

ci:
stage: ci
image: nixos/nix:2.23.3
image: nixos/nix:2.24.4
script:
# Cache CI dependencies
- ./bin/nix-build-and-cache ci
Expand All @@ -83,7 +83,7 @@ ci:

artifacts:
stage: artifacts
image: nixos/nix:2.23.3
image: nixos/nix:2.24.4
script:
- ./bin/nix-build-and-cache just .#static-x86_64-unknown-linux-musl
- cp result/bin/conduit x86_64-unknown-linux-musl
Expand Down
66 changes: 33 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ features = [
]

[workspace.dependencies.serde]
version = "1.0.204"
version = "1.0.209"
default-features = false
features = ["rc"]

Expand Down Expand Up @@ -216,7 +216,7 @@ version = "0.3.30"
default-features = false

[workspace.dependencies.tokio]
version = "1.39.2"
version = "1.40.0"
default-features = false
features = [
"fs",
Expand Down Expand Up @@ -449,7 +449,7 @@ default-features = false
version = "0.1"

[workspace.dependencies.syn]
version = "2.0.72"
version = "2.0.76"
default-features = false
features = ["full", "extra-traits"]

Expand Down
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# conduwuit

`main` / stable: [![CI and
`main`: [![CI and
Artifacts](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml)

<!-- ANCHOR: catchphrase --> ### a very cool, featureful fork of
[Conduit](https://conduit.rs/) <!-- ANCHOR_END: catchphrase -->
<!-- ANCHOR: catchphrase -->

### a very cool, featureful fork of [Conduit](https://conduit.rs/)

<!-- ANCHOR_END: catchphrase -->

Visit the [Conduwuit documentation](https://conduwuit.puppyirl.gay/) for more
information.
Expand Down Expand Up @@ -43,7 +46,9 @@ might run into bugs from time to time.

<!-- ANCHOR_END: body -->

<!-- ANCHOR: footer --> #### Contact
<!-- ANCHOR: footer -->

#### Contact

If you run into any question, feel free to

Expand Down Expand Up @@ -73,5 +78,6 @@ Both, but I prefer conduwuit.
- git.girlcock.ceo: <https://git.girlcock.ceo/strawberry/conduwuit>
- git.gay: <https://git.gay/june/conduwuit>
- Codeberg: <https://codeberg.org/girlbossceo/conduwuit>
- sourcehut: <https://git.sr.ht/~girlbossceo/conduwuit> <!-- ANCHOR_END: footer
-->
- sourcehut: <https://git.sr.ht/~girlbossceo/conduwuit>

<!-- ANCHOR_END: footer -->
4 changes: 2 additions & 2 deletions docs/conduwuit_coc.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment for everyone. This Code of Conduct applies to all conduwuit spaces,
including any further community rooms that reference this CoC. Here are our
guidelines to help maintain the welcoming atmosphere that sets conduwuit apart.

For the general foundational rules, please refer to the [Contributor's
For the general foundational rules, please refer to the [Contributor's
Covenant](https://github.com/girlbossceo/conduwuit/blob/main/CODE_OF_CONDUCT.md).
Below are additional guidelines specific to the conduwuit community.

Expand Down Expand Up @@ -90,4 +90,4 @@ comfortable doing that, then please send a DM to one of the moderators directly.

Together, let’s build a community where everyone feels valued and respected.

- The conduwuit Moderation Team
The conduwuit Moderation Team
16 changes: 16 additions & 0 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@ string. This does not apply to options that take booleans or numbers:
- `--option log=\"debug\"` works ✅
- `--option server_name='"example.com'"` works ✅

## Execute commandline flag

conduwuit supports running admin commands on startup using the commandline
argument `--execute`. The most notable use for this is to create an admin user
on first startup.

The syntax of this is a standard admin command without the prefix such as
`./conduwuit --execute "users create_user june"`

An example output of a success is:
```
INFO conduit_service::admin::startup: Startup command #0 completed:
Created user with user_id: @june:girlboss.ceo and password: `<redacted>`
```

This commandline argument can be paired with the `--option` flag.

## Environment variables

Expand Down
Loading
Loading