A few improvements to the systemd unit #1064

Merged

nex merged 2 commits from ginger/systemd-improvements into main 2025-10-17 15:04:51 +00:00

Conversation 11 Commits 2 Files changed 2 +9 -7

ginger commented 2025-09-22 15:21:16 +00:00

Member

Copy link

These should allow packaging for Arch, but are generally applicable to all distros.

thoughts:

• systemd credentials have a hard size limit of 1 megabyte. it seems unlikely that this will ever become a problem, but who knows
• it might be desirable to add support for reading and merging multiple config files, both as a solution to ^ and as a way to set distro-specific config in a file instead of using env vars in the unit

These should allow packaging for Arch, but are generally applicable to all distros. thoughts: - systemd credentials have a hard size limit of 1 megabyte. it seems unlikely that this will ever become a problem, but who knows - it might be desirable to add support for reading and merging multiple config files, both as a solution to ^ and as a way to set distro-specific config in a file instead of using env vars in the unit

ginger added 2 commits 2025-09-22 15:21:16 +00:00

fix: Use mode 600 for config files on Fedora because they contain secret info 702b0ecd03

feat: Make a few improvements to the systemd unit ... 37d848b4ef

- Use systemd's credential system to supply our config file
- Remove `ConfigurationDirectory` to prevent conflicts with package managers
- Set `config_reload_signal` to true using an envvar

Jade commented 2025-09-22 15:56:23 +00:00

Owner

Copy link

We should be able to add multiple layers of config files, we're already doing that for env and command line args for example. We're using figment, it's just a matter of adding new bits here. Side node, I think we technically already do have that, just with continuwuity_config overides conduwuit_config and so on lmao.

We should be able to add multiple layers of config files, we're already doing that for env and command line args for example. We're using [figment](https://docs.rs/figment/latest/figment/), it's just a matter of [adding new bits here](https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/src/core/config/mod.rs#L2212). Side node, I think we technically already do have that, just with continuwuity_config overides conduwuit_config and so on lmao.

ginger commented 2025-09-22 16:01:20 +00:00

Author

Member

Copy link

@Jade wrote in #1064 (comment):

We should be able to add multiple layers of config files, we're already doing that for env and command line args for example. We're using figment, it's just a matter of adding new bits here. Side node, I think we technically already do have that, just with continuwuity_config overides conduwuit_config and so on lmao.

I noticed that while working on this, actually 💀 the question is if that's worth including in this PR or if we can stick with using systemd's Environment setting

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1064#issuecomment-20475: > We should be able to add multiple layers of config files, we're already doing that for env and command line args for example. We're using [figment](https://docs.rs/figment/latest/figment/), it's just a matter of [adding new bits here](https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/src/core/config/mod.rs#L2212). Side node, I think we technically already do have that, just with continuwuity_config overides conduwuit_config and so on lmao. I noticed that while working on this, actually 💀 the question is if that's worth including in this PR or if we can stick with using systemd's `Environment` setting

Jade commented 2025-09-22 16:05:24 +00:00

Owner

Copy link

I mean honestly up to you, oh packaging wizard :P. I don't really know half of what I'm looking at here

I mean honestly up to you, oh packaging wizard :P. I don't really know half of what I'm looking at here

Kimiblock commented 2025-09-23 01:20:02 +00:00

Member

Copy link

If we do use EnvironmentFile, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations.

If we do use `EnvironmentFile`, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations.

ginger commented 2025-09-24 12:33:28 +00:00

Author

Member

Copy link

@Kimiblock wrote in #1064 (comment):

If we do use EnvironmentFile, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations.

(typo, I meant Environment not EnvironmentFile)

@Kimiblock wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1064#issuecomment-20512: > If we do use `EnvironmentFile`, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations. (typo, I meant `Environment` not `EnvironmentFile`)

ginger force-pushed ginger/systemd-improvements from 37d848b4ef to 29f138ed0f 2025-09-24 12:33:33 +00:00 Compare

ginger changed title from WIP: A few improvements to the systemd unit to A few improvements to the systemd unit 2025-09-24 12:33:36 +00:00

nex added this to the 0.5.0 milestone 2025-09-25 02:11:52 +00:00

nex added the

Enhancement

Meta/Packaging

labels 2025-09-25 02:12:13 +00:00

ginger force-pushed ginger/systemd-improvements from 29f138ed0f to e2f431d426 2025-09-25 12:52:39 +00:00 Compare

ginger requested review from Kimiblock 2025-09-25 13:33:07 +00:00

Kimiblock commented 2025-09-26 06:21:50 +00:00

Member

Copy link

@ginger wrote in #1064 (comment):

@Kimiblock wrote in #1064 (comment):

If we do use EnvironmentFile, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations.

(typo, I meant Environment not EnvironmentFile)

Ummm, you mean writing configurations directly in a systemd override service?

@ginger wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1064#issuecomment-20582: > @Kimiblock wrote in #1064 (comment): > > > If we do use `EnvironmentFile`, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations. > > (typo, I meant `Environment` not `EnvironmentFile`) Ummm, you mean writing configurations directly in a systemd override service?

Kimiblock approved these changes 2025-09-26 06:53:59 +00:00

ginger commented 2025-09-26 13:00:53 +00:00

Author

Member

Copy link

@Kimiblock wrote in #1064 (comment):

@ginger wrote in #1064 (comment):

@Kimiblock wrote in #1064 (comment):

If we do use EnvironmentFile, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations.

(typo, I meant Environment not EnvironmentFile)

Ummm, you mean writing configurations directly in a systemd override service?

User configuration will still be written in conduwuit.toml with this PR. I was thinking about ways to put vendor configuration in another configuration file instead of in the unit file, but I don't think that's necessary right now since the unit only changes a few options.

@Kimiblock wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1064#issuecomment-20673: > @ginger wrote in #1064 (comment): > > > @Kimiblock wrote in #1064 (comment): > > > If we do use `EnvironmentFile`, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations. > > > > > > (typo, I meant `Environment` not `EnvironmentFile`) > > Ummm, you mean writing configurations directly in a systemd override service? User configuration will still be written in `conduwuit.toml` with this PR. I was thinking about ways to put vendor configuration in another configuration file instead of in the unit file, but I don't think that's necessary right now since the unit only changes a few options.

ginger force-pushed ginger/systemd-improvements from e2f431d426 to 9a0116df61 2025-09-26 13:00:57 +00:00 Compare

Kimiblock commented 2025-09-27 01:29:01 +00:00

Member

Copy link

@ginger wrote in #1064 (comment):

@Kimiblock wrote in #1064 (comment):

@ginger wrote in #1064 (comment):

@Kimiblock wrote in #1064 (comment):

If we do use EnvironmentFile, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations.

(typo, I meant Environment not EnvironmentFile)

Ummm, you mean writing configurations directly in a systemd override service?

User configuration will still be written in conduwuit.toml with this PR. I was thinking about ways to put vendor configuration in another configuration file instead of in the unit file, but I don't think that's necessary right now since the unit only changes a few options.

Ah yes, that's kinda annoying. I have 2 options on my mind rn:

a) support multiple configurations and stack them together

b) set EnvironmentFile in a service override file, and users can disable it via another override

@ginger wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1064#issuecomment-20681: > @Kimiblock wrote in #1064 (comment): > > > @ginger wrote in #1064 (comment): > > > @Kimiblock wrote in #1064 (comment): > > > > If we do use `EnvironmentFile`, the docs should be modified to reflect that. Also on some package managers you have to manually specify it as "reserved" (i.e. uninstalling will not remove the file). Same as "stacked" configurations. > > > > > > > > > (typo, I meant `Environment` not `EnvironmentFile`) > > > > > > Ummm, you mean writing configurations directly in a systemd override service? > > User configuration will still be written in `conduwuit.toml` with this PR. I was thinking about ways to put vendor configuration in another configuration file instead of in the unit file, but I don't think that's necessary right now since the unit only changes a few options. Ah yes, that's kinda annoying. I have 2 options on my mind rn: a) support multiple configurations and stack them together b) set `EnvironmentFile` in a service override file, and users can disable it via another override

ginger force-pushed ginger/systemd-improvements from 9a0116df61 to 314250a0a1 2025-09-29 15:47:51 +00:00 Compare

ginger force-pushed ginger/systemd-improvements from 314250a0a1 to 4bdc2557d6 2025-10-03 12:51:23 +00:00 Compare

nex commented 2025-10-15 02:51:16 +00:00

Owner

Copy link

Is this good for merge?

Is this good for merge?

ginger commented 2025-10-16 12:59:09 +00:00

Author

Member

Copy link

@nex wrote in #1064 (comment):

Is this good for merge?

Yes, this is good to merge.

@nex wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1064#issuecomment-21052: > Is this good for merge? Yes, this is good to merge.

ginger force-pushed ginger/systemd-improvements from 4bdc2557d6 to 4a795a509c 2025-10-16 12:59:14 +00:00 Compare

ginger force-pushed ginger/systemd-improvements from 4a795a509c to a3592bd3b7 2025-10-17 13:37:44 +00:00 Compare

nex merged commit a3592bd3b7 into main 2025-10-17 15:04:51 +00:00

nex deleted branch ginger/systemd-improvements 2025-10-17 15:04:51 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Kimiblock

Labels

Clear labels   

Bug

Something isn't working as intended

  

Cherry-picking

Commits picked from other conduit projects

  

Database

This requires or includes changes to the database

  

Dependencies

Something dependency related

  

Dependencies/Renovate

Automatic dependency upgrades by Renovate

  

Difficulty

Easy

Low difficulty to implement - touches few parts of the codebase, low complexity

  

Difficulty

Hard

High difficulty to implement - touches many parts of the codebase, high complexity

  

Difficulty

Medium

Medium difficulty to implement - touches more parts of the codebase, higher complexity

  

Documentation

Improvements or additions to documentation

  

Enhancement

New feature or request

  

Good first issue

Good for newcomers

  

Help wanted

Additional eyes and keyboards are required for this one

  

Inherited

Issues that have been inhereted from the project pre-fork

  

Matrix/Administration

Features pertaining to homeserver administration

  

Matrix/Appservices

Features pertaining to the appservice API

  

Matrix/Auth

Features pertaining to authentication

  

Matrix/Client

Features pertaining to client-to-server interactions

  

Matrix/Core

Issues relating to core matrix functionality, such as state resolution and PDU formats

  

Matrix/Federation

Features pertaining to server-to-server interactions

  

Matrix/Hydra

Issues related to room version 12 and related changes (temporary label)

  

Matrix/MSC

Features pertaining to unstable matrix features

  

Matrix/Media

Features pertaining to media interactions

  

Meta

Related to housekeeping, maintenance, or other repo-meta.

  

Meta/CI

Issues related to CI changes

  

Meta/Packaging

Packaging

  

Priority

Blocking

This issue is blocking the next release

  

Priority

High

This issue is very important

  

Priority

Low

This issue is of a rather low priority

  

Security

This item is related to general security

  

Status/Blocked

This pull request or issue is currently blocked from being merged/closed

  

Status

Confirmed

This issue has enough information and is confirmed

  

Status

Duplicate

This issue or pull request already exists

  

Status

Invalid

This issue doesn't seem right

  

Status

Needs Investigation

This issue needs further investigation

  

To-Merge

  

Wont fix

This will not be worked on

  

old/ci/cd

Ci/CD

Archived

  

old/rust

Pull requests that update Rust code

Archived

No labels

Bug

Cherry-picking

Database

Dependencies

Dependencies/Renovate

Difficulty

Easy

Difficulty

Hard

Difficulty

Medium

Documentation

Enhancement

Good first issue

Help wanted

Inherited

Matrix/Administration

Matrix/Appservices

Matrix/Auth

Matrix/Client

Matrix/Core

Matrix/Federation

Matrix/Hydra

Matrix/MSC

Matrix/Media

Meta

Meta/CI

Meta/Packaging

Priority

Blocking

Priority

High

Priority

Low

Security

Status/Blocked

Status

Confirmed

Status

Duplicate

Status

Invalid

Status

Needs Investigation

To-Merge

Wont fix

old/ci/cd

old/rust

Milestone

Clear milestone

No items

No milestone

0.5.0

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

4 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

continuwuation/continuwuity!1064

No description provided.