From 93dce40328b6b2ae9f24a11b87c3cd9aef17abe8 Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Mon, 17 Feb 2020 13:56:49 +0100
Subject: [PATCH] moved files from docker-image imported repo to root

---
 docker-image/.dockerignore => .dockerignore                       | 0
 docker-image/.editorconfig => .editorconfig                       | 0
 docker-image/Dockerfile => Dockerfile                             | 0
 docker-image/Dockerfile-base => Dockerfile-base                   | 0
 docker-image/Makefile => Makefile                                 | 0
 docker-image/git-revision.sh => git-revision.sh                   | 0
 {docker-image/hotfix => hotfix}/2.0.1/Dockerfile                  | 0
 .../hotfix => hotfix}/2.0.1/create_and_destroy_users.patch        | 0
 .../hotfix => hotfix}/2.0.1/disable_project_history.patch         | 0
 {docker-image/hotfix => hotfix}/2.0.2/1-anon-upload.patch         | 0
 {docker-image/hotfix => hotfix}/2.0.2/2-read-only-access.patch    | 0
 {docker-image/hotfix => hotfix}/2.0.2/3-url-linking-1.patch       | 0
 {docker-image/hotfix => hotfix}/2.0.2/4-url-linking-2.patch       | 0
 {docker-image/hotfix => hotfix}/2.0.2/5-disable-analytics-1.patch | 0
 {docker-image/hotfix => hotfix}/2.0.2/6-disable-analytics-2.patch | 0
 {docker-image/hotfix => hotfix}/2.0.2/Dockerfile                  | 0
 {docker-image/hotfix => hotfix}/2.1.1/Dockerfile                  | 0
 {docker-image/hotfix => hotfix}/2.1.1/add-recaptcha-config.patch  | 0
 .../init_scripts => init_scripts}/00_make_sharelatex_data_dirs.sh | 0
 .../init_scripts => init_scripts}/00_regen_sharelatex_secrets.sh  | 0
 .../init_scripts => init_scripts}/00_set_docker_host_ipaddress.sh | 0
 {docker-image/init_scripts => init_scripts}/98_check_db_access.sh | 0
 {docker-image/init_scripts => init_scripts}/99_migrate.sh         | 0
 {docker-image/logrotate => logrotate}/sharelatex                  | 0
 {docker-image/nginx => nginx}/nginx.conf                          | 0
 {docker-image/nginx => nginx}/sharelatex.conf                     | 0
 {docker-image/runit => runit}/chat-sharelatex/run                 | 0
 {docker-image/runit => runit}/clsi-sharelatex/run                 | 0
 {docker-image/runit => runit}/contacts-sharelatex/run             | 0
 {docker-image/runit => runit}/docstore-sharelatex/run             | 0
 {docker-image/runit => runit}/document-updater-sharelatex/run     | 0
 {docker-image/runit => runit}/filestore-sharelatex/run            | 0
 {docker-image/runit => runit}/nginx/run                           | 0
 {docker-image/runit => runit}/notifications-sharelatex/run        | 0
 {docker-image/runit => runit}/real-time-sharelatex/run            | 0
 {docker-image/runit => runit}/spelling-sharelatex/run             | 0
 {docker-image/runit => runit}/tags-sharelatex/run                 | 0
 {docker-image/runit => runit}/track-changes-sharelatex/run        | 0
 {docker-image/runit => runit}/web-sharelatex/run                  | 0
 docker-image/services.js => services.js                           | 0
 docker-image/settings.coffee => settings.coffee                   | 0
 41 files changed, 0 insertions(+), 0 deletions(-)
 rename docker-image/.dockerignore => .dockerignore (100%)
 rename docker-image/.editorconfig => .editorconfig (100%)
 rename docker-image/Dockerfile => Dockerfile (100%)
 rename docker-image/Dockerfile-base => Dockerfile-base (100%)
 rename docker-image/Makefile => Makefile (100%)
 rename docker-image/git-revision.sh => git-revision.sh (100%)
 rename {docker-image/hotfix => hotfix}/2.0.1/Dockerfile (100%)
 rename {docker-image/hotfix => hotfix}/2.0.1/create_and_destroy_users.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.1/disable_project_history.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/1-anon-upload.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/2-read-only-access.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/3-url-linking-1.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/4-url-linking-2.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/5-disable-analytics-1.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/6-disable-analytics-2.patch (100%)
 rename {docker-image/hotfix => hotfix}/2.0.2/Dockerfile (100%)
 rename {docker-image/hotfix => hotfix}/2.1.1/Dockerfile (100%)
 rename {docker-image/hotfix => hotfix}/2.1.1/add-recaptcha-config.patch (100%)
 rename {docker-image/init_scripts => init_scripts}/00_make_sharelatex_data_dirs.sh (100%)
 rename {docker-image/init_scripts => init_scripts}/00_regen_sharelatex_secrets.sh (100%)
 rename {docker-image/init_scripts => init_scripts}/00_set_docker_host_ipaddress.sh (100%)
 rename {docker-image/init_scripts => init_scripts}/98_check_db_access.sh (100%)
 rename {docker-image/init_scripts => init_scripts}/99_migrate.sh (100%)
 rename {docker-image/logrotate => logrotate}/sharelatex (100%)
 rename {docker-image/nginx => nginx}/nginx.conf (100%)
 rename {docker-image/nginx => nginx}/sharelatex.conf (100%)
 rename {docker-image/runit => runit}/chat-sharelatex/run (100%)
 rename {docker-image/runit => runit}/clsi-sharelatex/run (100%)
 rename {docker-image/runit => runit}/contacts-sharelatex/run (100%)
 rename {docker-image/runit => runit}/docstore-sharelatex/run (100%)
 rename {docker-image/runit => runit}/document-updater-sharelatex/run (100%)
 rename {docker-image/runit => runit}/filestore-sharelatex/run (100%)
 rename {docker-image/runit => runit}/nginx/run (100%)
 rename {docker-image/runit => runit}/notifications-sharelatex/run (100%)
 rename {docker-image/runit => runit}/real-time-sharelatex/run (100%)
 rename {docker-image/runit => runit}/spelling-sharelatex/run (100%)
 rename {docker-image/runit => runit}/tags-sharelatex/run (100%)
 rename {docker-image/runit => runit}/track-changes-sharelatex/run (100%)
 rename {docker-image/runit => runit}/web-sharelatex/run (100%)
 rename docker-image/services.js => services.js (100%)
 rename docker-image/settings.coffee => settings.coffee (100%)

diff --git a/docker-image/.dockerignore b/.dockerignore
similarity index 100%
rename from docker-image/.dockerignore
rename to .dockerignore
diff --git a/docker-image/.editorconfig b/.editorconfig
similarity index 100%
rename from docker-image/.editorconfig
rename to .editorconfig
diff --git a/docker-image/Dockerfile b/Dockerfile
similarity index 100%
rename from docker-image/Dockerfile
rename to Dockerfile
diff --git a/docker-image/Dockerfile-base b/Dockerfile-base
similarity index 100%
rename from docker-image/Dockerfile-base
rename to Dockerfile-base
diff --git a/docker-image/Makefile b/Makefile
similarity index 100%
rename from docker-image/Makefile
rename to Makefile
diff --git a/docker-image/git-revision.sh b/git-revision.sh
similarity index 100%
rename from docker-image/git-revision.sh
rename to git-revision.sh
diff --git a/docker-image/hotfix/2.0.1/Dockerfile b/hotfix/2.0.1/Dockerfile
similarity index 100%
rename from docker-image/hotfix/2.0.1/Dockerfile
rename to hotfix/2.0.1/Dockerfile
diff --git a/docker-image/hotfix/2.0.1/create_and_destroy_users.patch b/hotfix/2.0.1/create_and_destroy_users.patch
similarity index 100%
rename from docker-image/hotfix/2.0.1/create_and_destroy_users.patch
rename to hotfix/2.0.1/create_and_destroy_users.patch
diff --git a/docker-image/hotfix/2.0.1/disable_project_history.patch b/hotfix/2.0.1/disable_project_history.patch
similarity index 100%
rename from docker-image/hotfix/2.0.1/disable_project_history.patch
rename to hotfix/2.0.1/disable_project_history.patch
diff --git a/docker-image/hotfix/2.0.2/1-anon-upload.patch b/hotfix/2.0.2/1-anon-upload.patch
similarity index 100%
rename from docker-image/hotfix/2.0.2/1-anon-upload.patch
rename to hotfix/2.0.2/1-anon-upload.patch
diff --git a/docker-image/hotfix/2.0.2/2-read-only-access.patch b/hotfix/2.0.2/2-read-only-access.patch
similarity index 100%
rename from docker-image/hotfix/2.0.2/2-read-only-access.patch
rename to hotfix/2.0.2/2-read-only-access.patch
diff --git a/docker-image/hotfix/2.0.2/3-url-linking-1.patch b/hotfix/2.0.2/3-url-linking-1.patch
similarity index 100%
rename from docker-image/hotfix/2.0.2/3-url-linking-1.patch
rename to hotfix/2.0.2/3-url-linking-1.patch
diff --git a/docker-image/hotfix/2.0.2/4-url-linking-2.patch b/hotfix/2.0.2/4-url-linking-2.patch
similarity index 100%
rename from docker-image/hotfix/2.0.2/4-url-linking-2.patch
rename to hotfix/2.0.2/4-url-linking-2.patch
diff --git a/docker-image/hotfix/2.0.2/5-disable-analytics-1.patch b/hotfix/2.0.2/5-disable-analytics-1.patch
similarity index 100%
rename from docker-image/hotfix/2.0.2/5-disable-analytics-1.patch
rename to hotfix/2.0.2/5-disable-analytics-1.patch
diff --git a/docker-image/hotfix/2.0.2/6-disable-analytics-2.patch b/hotfix/2.0.2/6-disable-analytics-2.patch
similarity index 100%
rename from docker-image/hotfix/2.0.2/6-disable-analytics-2.patch
rename to hotfix/2.0.2/6-disable-analytics-2.patch
diff --git a/docker-image/hotfix/2.0.2/Dockerfile b/hotfix/2.0.2/Dockerfile
similarity index 100%
rename from docker-image/hotfix/2.0.2/Dockerfile
rename to hotfix/2.0.2/Dockerfile
diff --git a/docker-image/hotfix/2.1.1/Dockerfile b/hotfix/2.1.1/Dockerfile
similarity index 100%
rename from docker-image/hotfix/2.1.1/Dockerfile
rename to hotfix/2.1.1/Dockerfile
diff --git a/docker-image/hotfix/2.1.1/add-recaptcha-config.patch b/hotfix/2.1.1/add-recaptcha-config.patch
similarity index 100%
rename from docker-image/hotfix/2.1.1/add-recaptcha-config.patch
rename to hotfix/2.1.1/add-recaptcha-config.patch
diff --git a/docker-image/init_scripts/00_make_sharelatex_data_dirs.sh b/init_scripts/00_make_sharelatex_data_dirs.sh
similarity index 100%
rename from docker-image/init_scripts/00_make_sharelatex_data_dirs.sh
rename to init_scripts/00_make_sharelatex_data_dirs.sh
diff --git a/docker-image/init_scripts/00_regen_sharelatex_secrets.sh b/init_scripts/00_regen_sharelatex_secrets.sh
similarity index 100%
rename from docker-image/init_scripts/00_regen_sharelatex_secrets.sh
rename to init_scripts/00_regen_sharelatex_secrets.sh
diff --git a/docker-image/init_scripts/00_set_docker_host_ipaddress.sh b/init_scripts/00_set_docker_host_ipaddress.sh
similarity index 100%
rename from docker-image/init_scripts/00_set_docker_host_ipaddress.sh
rename to init_scripts/00_set_docker_host_ipaddress.sh
diff --git a/docker-image/init_scripts/98_check_db_access.sh b/init_scripts/98_check_db_access.sh
similarity index 100%
rename from docker-image/init_scripts/98_check_db_access.sh
rename to init_scripts/98_check_db_access.sh
diff --git a/docker-image/init_scripts/99_migrate.sh b/init_scripts/99_migrate.sh
similarity index 100%
rename from docker-image/init_scripts/99_migrate.sh
rename to init_scripts/99_migrate.sh
diff --git a/docker-image/logrotate/sharelatex b/logrotate/sharelatex
similarity index 100%
rename from docker-image/logrotate/sharelatex
rename to logrotate/sharelatex
diff --git a/docker-image/nginx/nginx.conf b/nginx/nginx.conf
similarity index 100%
rename from docker-image/nginx/nginx.conf
rename to nginx/nginx.conf
diff --git a/docker-image/nginx/sharelatex.conf b/nginx/sharelatex.conf
similarity index 100%
rename from docker-image/nginx/sharelatex.conf
rename to nginx/sharelatex.conf
diff --git a/docker-image/runit/chat-sharelatex/run b/runit/chat-sharelatex/run
similarity index 100%
rename from docker-image/runit/chat-sharelatex/run
rename to runit/chat-sharelatex/run
diff --git a/docker-image/runit/clsi-sharelatex/run b/runit/clsi-sharelatex/run
similarity index 100%
rename from docker-image/runit/clsi-sharelatex/run
rename to runit/clsi-sharelatex/run
diff --git a/docker-image/runit/contacts-sharelatex/run b/runit/contacts-sharelatex/run
similarity index 100%
rename from docker-image/runit/contacts-sharelatex/run
rename to runit/contacts-sharelatex/run
diff --git a/docker-image/runit/docstore-sharelatex/run b/runit/docstore-sharelatex/run
similarity index 100%
rename from docker-image/runit/docstore-sharelatex/run
rename to runit/docstore-sharelatex/run
diff --git a/docker-image/runit/document-updater-sharelatex/run b/runit/document-updater-sharelatex/run
similarity index 100%
rename from docker-image/runit/document-updater-sharelatex/run
rename to runit/document-updater-sharelatex/run
diff --git a/docker-image/runit/filestore-sharelatex/run b/runit/filestore-sharelatex/run
similarity index 100%
rename from docker-image/runit/filestore-sharelatex/run
rename to runit/filestore-sharelatex/run
diff --git a/docker-image/runit/nginx/run b/runit/nginx/run
similarity index 100%
rename from docker-image/runit/nginx/run
rename to runit/nginx/run
diff --git a/docker-image/runit/notifications-sharelatex/run b/runit/notifications-sharelatex/run
similarity index 100%
rename from docker-image/runit/notifications-sharelatex/run
rename to runit/notifications-sharelatex/run
diff --git a/docker-image/runit/real-time-sharelatex/run b/runit/real-time-sharelatex/run
similarity index 100%
rename from docker-image/runit/real-time-sharelatex/run
rename to runit/real-time-sharelatex/run
diff --git a/docker-image/runit/spelling-sharelatex/run b/runit/spelling-sharelatex/run
similarity index 100%
rename from docker-image/runit/spelling-sharelatex/run
rename to runit/spelling-sharelatex/run
diff --git a/docker-image/runit/tags-sharelatex/run b/runit/tags-sharelatex/run
similarity index 100%
rename from docker-image/runit/tags-sharelatex/run
rename to runit/tags-sharelatex/run
diff --git a/docker-image/runit/track-changes-sharelatex/run b/runit/track-changes-sharelatex/run
similarity index 100%
rename from docker-image/runit/track-changes-sharelatex/run
rename to runit/track-changes-sharelatex/run
diff --git a/docker-image/runit/web-sharelatex/run b/runit/web-sharelatex/run
similarity index 100%
rename from docker-image/runit/web-sharelatex/run
rename to runit/web-sharelatex/run
diff --git a/docker-image/services.js b/services.js
similarity index 100%
rename from docker-image/services.js
rename to services.js
diff --git a/docker-image/settings.coffee b/settings.coffee
similarity index 100%
rename from docker-image/settings.coffee
rename to settings.coffee