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

.gitignore: Only ignore sydent.conf and sydent.db if they occur in th… #354

Conversation

sunweaver
Copy link
Contributor

@sunweaver sunweaver commented Jun 2, 2021

…e project's base folder.

Reasoning: In Debian, we provide a debian/sydent.conf file as the
initial config template file to be installed to /etc/matrix-sydent/.
This file is stored in the Debian packaging Git (available on
https://salsa.debian.org/matrix-team/matrix-sydent/).

With this change in upstream's .gitignore file, we make sure that
changes in debian/sydent.conf get properly tracked via the packaging
Git, whereas changes to sydent.conf (in the project's basedir) are hidden
from Git (which is relevant for software testing by upstream).

The same logic quasi applies to the sydent.db file, although the Debian
package, of course, does not ship such a file.

Signed-off-by: Mike Gabriel mike.gabriel@das-netzwerkteam.de

Pull Request Checklist

  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fix a bug that prevented receiving messages from other servers." instead of "Move X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
  • Pull request includes a sign off

…e project's base folder. (matrix-org#354)

 Reasoning: In Debian, we provide a debian/sydent.conf file as the
 initial config template file to be installed to /etc/matrix-sydent/.
 This file is stored in the Debian packaging Git (available on
 https://salsa.debian.org/matrix-team/matrix-sydent/).

 With this change in upstream's .gitignore file, we make sure that
 changes in debian/sydent.conf get properly tracked via the packaging
 Git, whereas changes to sydent.conf (in the project's basedir) are hidden
 from Git (which is relevant for software testing by upstream).

 The same logic quasi applies to the sydent.db file, although the Debian
 package, of course, does not ship such a file.

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
@sunweaver sunweaver force-pushed the pr/gitignore-runtime-files-only-in-base-folder branch from 04b64a9 to 34a28f2 Compare June 2, 2021 10:42
Copy link
Contributor

@callahad callahad left a comment

Choose a reason for hiding this comment

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

Works for me!

@callahad callahad merged commit e37a1a9 into matrix-org:main Jun 2, 2021
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