Skip to content

Commit

Permalink
.gitignore: Only ignore sydent.conf and sydent.db if they occur in th…
Browse files Browse the repository at this point in the history
…e project's base folder. (#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>
  • Loading branch information
sunweaver committed Jun 2, 2021
1 parent 5ef9d3b commit 34a28f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ _trial_temp
.python-version

# Runtime files
sydent.conf
sydent.db
/sydent.conf
/sydent.db
/matrix_is_test/sydent.stderr
1 change: 1 addition & 0 deletions changelog.d/354.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.gitignore: Only ignore sydent.conf and sydent.db if they occur in the project's base folder.

0 comments on commit 34a28f2

Please sign in to comment.