Commit Graph

2146 Commits (5f0bea69614de0bc0dac3b440fcb070274ccb9cb)
 

Author SHA1 Message Date
Matthias Ahouansou 5f0bea6961
refactor: check if federation is disabled inside the authcheck where possible 5 months ago
Charles Hall ab98b52b21 Merge branch 'remove-log-modification' into 'next'
Remove log config modification

See merge request famedly/conduit!553
5 months ago
Charles Hall 741ca63e94 Merge branch 'argparse' into 'next'
Add argument parser for the conduit executable

Closes #285

See merge request famedly/conduit!385
5 months ago
Max Cohen 9a81a49c6a
Add argument parser for the conduit executable
Allow fetching the version with `conduit --version`. Fixes #285.
5 months ago
Charles Hall c42aeb506f Merge branch 'ci/avoid-duplicate-pipelines' into 'next'
fix(ci): avoid duplicate pipelines

See merge request famedly/conduit!600
5 months ago
Samuel Meenzen 4af691d737
fix(ci): avoid duplicate pipelines 5 months ago
Charles Hall 88fbd5b294 Merge branch 'rename-rocksdb-crate' into 'next'
rename the `rust-rocksdb` crate to just `rocksdb`

See merge request famedly/conduit!599
5 months ago
Charles Hall d1bc7fcfd2
rename the `rust-rocksdb` crate to just `rocksdb`
This way the old `cfg`s still work and we don't need to constantly
remind ourselves what programming language we're using in `use`
statements.

Also fixes a problem where RocksDB users couldn't start Conduit because
the old `cfg`s were using the original crate's name instead of the
`backend_rocksdb` feature name for some reason. Maybe that should be
changed, but I'm not sure.
5 months ago
Charles Hall dc89fbed3a
document log config syntax, don't give example
Because the old one was stale. Shocking!
5 months ago
Charles Hall 516876f8ef
remove final reference to sled in log config 5 months ago
Charles Hall ed5bd23255
remove explicit references to log config
They're all stale. Sled was yote long ago.
5 months ago
Charles Hall 5f053a9357
link to example config instead of copying it
DRY FTW
5 months ago
Charles Hall 9ff9e85ebe
add newline to end of file
Please, people.
5 months ago
tezlm daed4cdddf
Remove log config modification 5 months ago
Charles Hall 086c4daa38 Merge branch 'update-rocksdb' into 'next'
update rocksdb

See merge request famedly/conduit!577
5 months ago
Charles Hall 10f3f9da49
switch/update rocksdb crate
This fork was created because the original seems de-facto unmaintained.
5 months ago
Charles Hall a095e02d04 Merge branch 'ci/optional-artifacts' into 'next'
feat: run ci on demand to prevent unnecessary job executions

See merge request famedly/conduit!585
5 months ago
Samuel Meenzen 0d2f1348da
feat: run ci on demand to prevent unnecessary job executions 6 months ago
Charles Hall 20bb214d7e Merge branch 'ci-efficiency' into 'next'
make CI more efficient

See merge request famedly/conduit!596
6 months ago
Charles Hall ae69da635b
allow overriding the attic endpoint
And also the public key so that pulling from the new endpoint will work.

This allows other people to host their own attic instances and configure
their (CI) environment to override the default endpoint so e.g. they can
take advantage of a binary cache without having write access to the
official one.

I didn't actually test this change but I think it should work.

Also why'd I format the script like that, ew lol
6 months ago
Charles Hall d411e9037c
upload all devshell inputs to the cache
This will also include attic, so we don't need to explicitly do this
in `./bin/nix-build-and-cache` anymore, which is good because that
script gets called a good number of times and doing that repeatedly was
a bit of a waste.
6 months ago
Charles Hall d5a9c6ac32
use nix-built binary to produce debian package
Currently just for `x86_64-unknown-linux-musl`. Theoretically, we can
use this same mechanism for `aarch64-unknown-linux-musl`. Practically,
I'm not sure just this will even work.
6 months ago
Charles Hall 4e09c9e58a
build all nix-based artifacts in a single job
This will reduce the amount of full builds that need to be done by runs
that don't have write access to the nix binary cache.
6 months ago
Charles Hall 6281c64c33
upgrade nixos/nix image 6 months ago
Charles Hall 4f352a711a
add trailing newline to file
Please fix your editor configuration...
6 months ago
Charles Hall 10b7b174b6
fix documented target triple
Even though it doesn't really matter because it's containerized anyway.
6 months ago
Charles Hall e70f33741c
update flake.lock
Also switch names to match the newer upstream nixpkgs code.

Flake lock file updates:

• Updated input 'attic':
    'github:zhaofengli/attic/fbe252a5c21febbe920c025560cbd63b20e24f3b' (2024-01-18)
  → 'github:zhaofengli/attic/6eabc3f02fae3683bffab483e614bebfcd476b21' (2024-02-14)
• Updated input 'fenix':
    'github:nix-community/fenix/e132ea0eb0c799a2109a91688e499d7bf4962801' (2024-01-18)
  → 'github:nix-community/fenix/c8943ea9e98d41325ff57d4ec14736d330b321b2' (2024-03-05)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/9d9b34354d2f13e33568c9c55b226dd014a146a0' (2024-01-17)
  → 'github:rust-lang/rust-analyzer/9f14343f9ee24f53f17492c5f9b653427e2ad15e' (2024-03-04)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
  → 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/842d9d80cfd4560648c785f8a4e6f3b096790e19' (2024-01-17)
  → 'github:NixOS/nixpkgs/b8697e57f10292a6165a20f03d2f42920dfaf973' (2024-03-03)
6 months ago
Charles Hall 161ad8f9a4
update to latest crane before a regression
Once these issues are fixed, or at least just the one against crane, we
can go back to `ref=master`.

Flake lock file updates:

• Updated input 'crane':
    'github:ipetkov/crane/c798790eabec3e3da48190ae3698ac227aab770c' (2024-01-28)
  → 'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e' (2024-02-11)
6 months ago
Timo Kösters 732d331847 Merge branch 'async-mutex-guards' into 'next'
refactor: use async-aware RwLocks and Mutexes where possible

See merge request famedly/conduit!595
6 months ago
Matthias Ahouansou ee7efdd403
typo: as -> has 6 months ago
Matthias Ahouansou 07bb369c5c
perf: remove unnecessary async 6 months ago
Matthias Ahouansou 17dd8cb918
style: rename Sync(Mutex|RwLock) to Std(Mutex|RwLock) 6 months ago
Matthias Ahouansou e33d8430d3
typo: colsures -> closures 6 months ago
Matthias Ahouansou c58af8485d
revert: remove dependency on async_recursion 6 months ago
Matthias Ahouansou becaad677f
refactor: use async-aware RwLocks and Mutexes where possible 6 months ago
Timo Kösters 57575b7c6f Merge branch 'dont-give-guests-admin' into 'next'
fix(accounts): don't give guests admin

See merge request famedly/conduit!591
6 months ago
Matthias Ahouansou 4934020ee7
style: remove unnecessary else block 6 months ago
Timo Kösters 7bb480ceb8 Merge branch 'readme' into 'next'
docs: small fixes for the README

See merge request famedly/conduit!592
6 months ago
Matthias Ahouansou da5975d727 fix: avoid panics when admin room is not available 6 months ago
Timo Kösters 56a57d5489 docs: small fixes for the README 6 months ago
Matthias Ahouansou e06e15d4ec
fix(accounts): don't give guests admin 6 months ago
Timo Kösters 18e684b92e Merge branch 'performance' into 'next'
Improvements to /sync performance and db size

See merge request famedly/conduit!590
6 months ago
Timo Kösters a159fff08a
improvement: deactivate old presence code because it slows down sync
The problem is that for each sync, it creates a new rocksdb iterator for each room, and creating iterators is somewhat expensive
6 months ago
Timo Kösters 62dda7a43f
improvement: delete old rocksdb LOG files 6 months ago
Timo Kösters 99ab234f40
Merge branch 'fixes' into 'next'
Avoid panic when client is confused about rooms

See merge request famedly/conduit!588
6 months ago
Timo Kösters e83416bb5a
Merge branch 'fixnginx' into 'next'
Fixed nginx proxy_pass directive

See merge request famedly/conduit!589
6 months ago
olly1240 726b6f0fa6
Fixed nginx proxy_pass directive 6 months ago
Timo Kösters d7fd89df49
fix: avoid panic when client is confused about rooms 6 months ago
Timo Kösters f4e57fdb22
Avoid federation when it is not necessary 6 months ago
Timo Kösters 4f096adcfa Merge branch 'bump-ruma' into 'next'
Bump ruma to latest commit

See merge request famedly/conduit!586
6 months ago