From fa172ab4ade58fcd9c1f4297b904037c3aa2b6d2 Mon Sep 17 00:00:00 2001
From: saltycrys <73420320+saltycrys@users.noreply.github.com>
Date: Wed, 9 Dec 2020 02:48:28 +0100
Subject: [PATCH] Untrack config.yml

`config/config.yml` has been untracked and moved to `config/config.example.yml`.

The Dockerfile has been updated to copy all `config/config.*` files and to try
to move `config/config.example.yml` to `config/config.yml`. If a user supplied
`config/config.yml` exists it is not overwritten.
---
 .gitignore                                | 1 +
 config/{config.yml => config.example.yml} | 0
 docker/Dockerfile                         | 3 ++-
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename config/{config.yml => config.example.yml} (100%)

diff --git a/.gitignore b/.gitignore
index 3bbfccf0..1779a73d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /.vscode/
 /invidious
 /sentry
+/config/config.yml
diff --git a/config/config.yml b/config/config.example.yml
similarity index 100%
rename from config/config.yml
rename to config/config.example.yml
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 96f844fe..b05f66eb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,7 +23,8 @@ WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
     adduser -u 1000 -S invidious -G invidious
 COPY ./assets/ ./assets/
-COPY --chown=invidious ./config/config.yml ./config/config.yml
+COPY --chown=invidious ./config/config.* ./config/
+RUN mv -n config/config.example.yml config/config.yml
 RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: postgres/' config/config.yml
 COPY ./config/sql/ ./config/sql/
 COPY ./locales/ ./locales/