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

(doc): Update docker-compose.yml and conduwuit-example.toml #654

Closed
wants to merge 0 commits into from

Conversation

bumpsoo
Copy link
Contributor

@bumpsoo bumpsoo commented Jan 5, 2025

The server cannot start without a registration token when registration is configured

@@ -375,13 +375,15 @@
#
#allow_registration = false

# This item is undocumented. Please contribute documentation for it.
# Enabling this setting opens registration to anyone without restrictions.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example config documentation changes need to be made in src/core/config/mod.rs and the example config needs to be regenerated via building conduwuit. See the top of this file.

### THIS FILE IS GENERATED. CHANGES/CONTRIBUTIONS IN THE REPO WILL BE
### OVERWRITTEN!
###
### You should rename this file before configuring your server. Changes to
### documentation and defaults can be contributed in source code at
### src/core/config/mod.rs. This file is generated when building.

Please make this documentation change in src/core/config/mod.rs and regenerate the example config file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know the file was generated. I fixed it

@bumpsoo
Copy link
Contributor Author

bumpsoo commented Jan 6, 2025

Could you run it one more time?

@bumpsoo
Copy link
Contributor Author

bumpsoo commented Jan 7, 2025

I didn't understand the test at first. It's just a git diff after building. I should have read the engage file more carefully.
The reason for the failure was that I tested the example locally after committing without cleaning the built files.
Since the generated example file contains tls.global and global.well_known twice, I edited the file before committing.

I only used the following command:
direnv exec . engage just tests example-config
It depends on cargo/default.

The example file is the same as the result of cargo/all, so it should be fine.

@bumpsoo
Copy link
Contributor Author

bumpsoo commented Jan 7, 2025

Now the result looks similar to what I got on my laptop. Based on the output, it seems that cargo/default was executed first, and cargo/all was waiting. In the previous result, cargo/all was executed first, which is correct. It seems that the example file generated by cargo/default and cargo/all is different.

@girlbossceo
Copy link
Owner

I'll just fix your PR when I have time in the next few days.

@girlbossceo
Copy link
Owner

Made a mistake when rebasing/force-pushing to your PR; I've merged this in 9dcf289

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants