diff options
author | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-12-05 16:30:17 -0600 |
---|---|---|
committer | Christian Breunig <christian@breunig.cc> | 2023-12-09 15:29:20 +0100 |
commit | ff3ecc1b4d4ede0fb4ca15484a9655c628f4354f (patch) | |
tree | 500433ee770391152f6b81dcabbbf116f175acb2 /data/templates/system | |
parent | 8ef7afb9a6f243bf956cce7ad09e3871e3861ef3 (diff) | |
download | vyos-1x-ff3ecc1b4d4ede0fb4ca15484a9655c628f4354f.tar.gz vyos-1x-ff3ecc1b4d4ede0fb4ca15484a9655c628f4354f.zip |
git: T5803: Adjust git configuration for baseline defaults
Apply baseline defaults for `.gitattributes` and `.vscode/settings.json`
for improved developer experience.
The `.gitattrbutes` settings are based on:
Git documentation (https://git-scm.com/docs/gitattributes#_effects)
GitHub documentation (https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings)
Community templates (https://github.com/gitattributes/gitattributes)
Since editor-agnostic line-ending specific settings are applied to
`.gitattributes`, they can be removed from `.vscode/settings.json`.
The global VSCode defaults have also been removed to avoid duplication.
(cherry picked from commit c30002208d392177cb1ffc1a5c714f7ad6d573b6)
Diffstat (limited to 'data/templates/system')
-rw-r--r-- | data/templates/system/sysctl.conf.j2 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/templates/system/sysctl.conf.j2 b/data/templates/system/sysctl.conf.j2 index 59a19e157..db699c3d8 100644 --- a/data/templates/system/sysctl.conf.j2 +++ b/data/templates/system/sysctl.conf.j2 @@ -1,7 +1,7 @@ -# autogenerated by system_sysctl.py
-
-{% if parameter is vyos_defined %}
-{% for k, v in parameter.items() %}
-{{ k }} = {{ v.value }}
-{% endfor %}
-{% endif %}
+# autogenerated by system_sysctl.py + +{% if parameter is vyos_defined %} +{% for k, v in parameter.items() %} +{{ k }} = {{ v.value }} +{% endfor %} +{% endif %} |