From ad628cdf1bc388bce7653548edc5be09eb870c43 Mon Sep 17 00:00:00 2001 From: Martti Roitto Date: Mon, 20 Nov 2023 17:02:42 +0200 Subject: [PATCH 1/2] Add .gitattributes file; update .gitignore --- .gitattributes | 25 +++++++++++++++++++++++++ .gitignore | 7 +++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..f9891268 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,25 @@ +*.Dockerfile text eol=lf +.dockerignore text eol=lf +.eslintignore text eol=lf +.example text eol=lf +.gitattributes text eol=lf +.gitignore text eol=lf +.htaccess text eol=lf +.prettierrc text eol=lf +*.css text eol=lf +*.inc text eol=lf +*.ini text eol=lf +*.js text eol=lf +*.json text eol=lf +*.lock text eol=lf +*.md text eol=lf +*.module text eol=lf +*.neon text eol=lf +*.php text eol=lf +*.sh text eol=lf +*.svg text eol=lf +*.ts text eol=lf +*.tsx text eol=lf +*.txt text eol=lf +*.xml text eol=lf +*.yml text eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index 10f051a4..decb77f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -# Ignore .gitattributes files -.gitattributes .editorconfig # Ignore potential database dumps: @@ -20,3 +18,8 @@ node_modules # Ignore start.sh script status file .last_successful_command + +# Unencrypted secrets +/silta/secrets*.yml +# ... except the example secrets +!/silta/secrets.example.yml From 7d1d3b0e80bb127c86fe1dc44eb5a809422b3962 Mon Sep 17 00:00:00 2001 From: Martti Roitto Date: Mon, 20 Nov 2023 17:07:15 +0200 Subject: [PATCH 2/2] .example -> *.example --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index f9891268..50f3826d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,11 @@ -*.Dockerfile text eol=lf .dockerignore text eol=lf .eslintignore text eol=lf -.example text eol=lf .gitattributes text eol=lf .gitignore text eol=lf .htaccess text eol=lf .prettierrc text eol=lf +*.Dockerfile text eol=lf +*.example text eol=lf *.css text eol=lf *.inc text eol=lf *.ini text eol=lf