From 187f1965e22f6f34b8018fd6710f28f045ee1171 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 8 Jul 2022 14:28:09 +0100
Subject: [PATCH] Moving files around to make single image build easier to
 follow, getting all data directories into one place for easy volume
 management.

---
 hosting/single/Dockerfile                          | 12 +++++++-----
 hosting/single/{ => clouseau}/clouseau             |  0
 hosting/single/{ => clouseau}/clouseau.ini         |  2 +-
 hosting/single/{ => clouseau}/log4j.properties     |  0
 hosting/single/couch/local.ini                     |  5 +++++
 hosting/single/{ => couch}/vm.args                 |  0
 hosting/single/{ => nginx}/nginx-default-site.conf |  3 ---
 hosting/single/{ => nginx}/nginx.conf              |  0
 hosting/single/runner.sh                           |  2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)
 rename hosting/single/{ => clouseau}/clouseau (100%)
 rename hosting/single/{ => clouseau}/clouseau.ini (92%)
 rename hosting/single/{ => clouseau}/log4j.properties (100%)
 create mode 100644 hosting/single/couch/local.ini
 rename hosting/single/{ => couch}/vm.args (100%)
 rename hosting/single/{ => nginx}/nginx-default-site.conf (99%)
 rename hosting/single/{ => nginx}/nginx.conf (100%)

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index b338201a20..1b48de2849 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -67,8 +67,8 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh &
   npm install --global yarn pm2
 
 # setup nginx
-ADD hosting/single/nginx.conf /etc/nginx
-ADD hosting/single/nginx-default-site.conf /etc/nginx/sites-enabled/default
+ADD hosting/single/nginx/nginx.conf /etc/nginx
+ADD hosting/single/nginx/nginx-default-site.conf /etc/nginx/sites-enabled/default
 RUN mkdir -p /var/log/nginx && \
   touch /var/log/nginx/error.log && \
   touch /var/run/nginx.pid
@@ -87,13 +87,15 @@ RUN wget https://github.com/cloudant-labs/clouseau/releases/download/2.21.0/clou
 
 WORKDIR /opt/clouseau
 RUN mkdir ./bin
-ADD hosting/single/clouseau ./bin/
-ADD hosting/single/log4j.properties hosting/single/clouseau.ini ./
+ADD hosting/single/clouseau/clouseau ./bin/
+ADD hosting/single/clouseau/log4j.properties hosting/single/clouseau/clouseau.ini ./
 RUN chmod +x ./bin/clouseau
 
 # setup CouchDB
 WORKDIR /opt/couchdb
-ADD hosting/single/vm.args ./etc/
+ADD hosting/single/couch/vm.args hosting/single/couch/local.ini ./etc/
+RUN mkdir -p /data/couch/dbs /data/couch/views
+RUN chown couchdb:couchdb /data/couch /data/couch/dbs /data/couch/views
 
 # setup minio
 WORKDIR /minio
diff --git a/hosting/single/clouseau b/hosting/single/clouseau/clouseau
similarity index 100%
rename from hosting/single/clouseau
rename to hosting/single/clouseau/clouseau
diff --git a/hosting/single/clouseau.ini b/hosting/single/clouseau/clouseau.ini
similarity index 92%
rename from hosting/single/clouseau.ini
rename to hosting/single/clouseau/clouseau.ini
index f086cf0398..78e43744e5 100644
--- a/hosting/single/clouseau.ini
+++ b/hosting/single/clouseau/clouseau.ini
@@ -7,7 +7,7 @@ name=clouseau@127.0.0.1
 cookie=monster
 
 ; the path where you would like to store the search index files
-dir=/opt/couchdb/data/search
+dir=/data/search
 
 ; the number of search indexes that can be open simultaneously
 max_indexes_open=500
diff --git a/hosting/single/log4j.properties b/hosting/single/clouseau/log4j.properties
similarity index 100%
rename from hosting/single/log4j.properties
rename to hosting/single/clouseau/log4j.properties
diff --git a/hosting/single/couch/local.ini b/hosting/single/couch/local.ini
new file mode 100644
index 0000000000..72872a60e1
--- /dev/null
+++ b/hosting/single/couch/local.ini
@@ -0,0 +1,5 @@
+; CouchDB Configuration Settings
+
+[couchdb]
+database_dir = /data/couch/dbs
+view_index_dir = /data/couch/views
diff --git a/hosting/single/vm.args b/hosting/single/couch/vm.args
similarity index 100%
rename from hosting/single/vm.args
rename to hosting/single/couch/vm.args
diff --git a/hosting/single/nginx-default-site.conf b/hosting/single/nginx/nginx-default-site.conf
similarity index 99%
rename from hosting/single/nginx-default-site.conf
rename to hosting/single/nginx/nginx-default-site.conf
index 964313fa73..c0d80a0185 100644
--- a/hosting/single/nginx-default-site.conf
+++ b/hosting/single/nginx/nginx-default-site.conf
@@ -88,7 +88,4 @@ server {
     gzip_proxied any;
     gzip_comp_level 6;
     gzip_types text/plain text/css text/xml application/json application/javascript application/rss+xml application/atom+xml image/svg+xml;
-
-
-
 }
diff --git a/hosting/single/nginx.conf b/hosting/single/nginx/nginx.conf
similarity index 100%
rename from hosting/single/nginx.conf
rename to hosting/single/nginx/nginx.conf
diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index 6f3d247842..8dc3174993 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -1,6 +1,6 @@
 redis-server --requirepass $REDIS_PASSWORD &
 /opt/clouseau/bin/clouseau &
-/minio/minio server /minio &
+/minio/minio server /data/minio &
 /docker-entrypoint.sh /opt/couchdb/bin/couchdb &
 /etc/init.d/nginx restart
 if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then