diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-02-20 11:10:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 11:10:50 +0000 |
| commit | 8d98dc8ffe3f0231a6f03312ce8f910db89ae9c3 (patch) | |
| tree | e055fc1fe62c7b35b08a51a2f94249625aea68d4 | |
| parent | Merge pull request #4678 from matrix-org/rav/tls_install_instructions (diff) | |
| download | synapse-8d98dc8ffe3f0231a6f03312ce8f910db89ae9c3.tar.xz | |
Clean up gitignores (#4688)
I just got bitten by a file being caught by the .gitignore, which shouldn't have been, and am now pissed off with the .gitignore. I have basically declared bankruptcy on it and started again.
| -rw-r--r-- | .gitignore | 88 | ||||
| -rw-r--r-- | changelog.d/4688.misc | 1 | ||||
| -rw-r--r-- | demo/.gitignore | 7 |
3 files changed, 38 insertions, 58 deletions
diff --git a/.gitignore b/.gitignore index 37f0028d66..a20f3e615d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,64 +1,36 @@ -*.pyc -.*.swp +# filename patterns *~ -*.lock - -.DS_Store -_trial_temp/ -_trial_temp*/ -logs/ -dbs/ +.*.swp +.#* +*.deb *.egg -dist/ -docs/build/ *.egg-info -pip-wheel-metadata/ - -cmdclient_config.json -homeserver*.db -homeserver*.log -homeserver*.log.* -homeserver*.pid -/homeserver*.yaml - -*.signing.key -*.tls.crt -*.tls.dh -*.tls.key - -.coverage* -coverage.* -!.coveragerc -htmlcov - -demo/*/*.db -demo/*/*.log -demo/*/*.log.* -demo/*/*.pid -demo/media_store.* -demo/etc - -uploads -cache - -.idea/ -media_store/ - +*.lock +*.pyc *.tac +_trial_temp/ +_trial_temp*/ -build/ -venv/ -venv*/ -*venv/ - -localhost-800*/ -static/client/register/register_config.js -.tox - -env/ -*.config +# stuff that is likely to exist when you run a server locally +/*.signing.key +/*.tls.crt +/*.tls.key +/uploads +/media_store/ + +# IDEs +/.idea/ +/.ropeproject/ +/.vscode/ + +# build products +/.coverage* +!/.coveragerc +/.tox +/build/ +/coverage.* +/dist/ +/docs/build/ +/htmlcov +/pip-wheel-metadata/ -.vscode/ -.ropeproject/ -*.deb -/debs diff --git a/changelog.d/4688.misc b/changelog.d/4688.misc new file mode 100644 index 0000000000..24cd2eb424 --- /dev/null +++ b/changelog.d/4688.misc @@ -0,0 +1 @@ +Clean up gitignores diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 0000000000..4d12712343 --- /dev/null +++ b/demo/.gitignore @@ -0,0 +1,7 @@ +*.db +*.log +*.log.* +*.pid + +/media_store.* +/etc |