Merge branch 'master' of github.com:WeebDev/lolisafe

5 files changed, 14 insertions, 11 deletions

diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
index 982370a..8b41939 100644
--- a/docker/docker-compose.local.yml
+++ b/docker/docker-compose.local.yml
@@ -1,10 +1,6 @@
 version: "3.7"
 
 services:
-    nginx:
-        volumes:
-            - nginx-data:/etc/nginx
-
     chibisafe:
         volumes:
             - chibisafe-data:/usr/chibisafe/uploads
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 9683a98..cd766d7 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -1,10 +1,6 @@
 version: "3.7"
 
 services:
-    nginx:
-        volumes:
-            - ./nginx-data:/etc/nginx
-
     chibisafe:
         volumes:
             - ./chibisafe-data:/usr/chibisafe/uploads
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 60626ba..2731007 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -3,3 +3,4 @@ FROM nginx
 COPY nginxconfig.io /etc/nginx/nginxconfig.io
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY chibisafe.moe.conf /etc/nginx/conf.d/chibisafe.moe.conf
+COPY ssl /etc/nginx/ssl
diff --git a/docker/nginx/ssl/.gitkeep b/docker/nginx/ssl/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker/nginx/ssl/.gitkeep
diff --git a/docs/docker.md b/docs/docker.md
index f3fb23c..0dd8bec 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -1,9 +1,19 @@
 ### Using Docker
 
 If you want to avoid all the hassle of installing the dependencies, configuring nginx and etc you can simply use our docker image which makes things way faster.
-First make sure you have docker and docker composer installed, on Linux this would be `sudo apt install docker-ce`.
-After that edit the config file called `docker-compose.config.example.yml` with the values you want. Those that are left commented will use the default values.
-Once you are done editing that file remove the `example` from the name so it ends up being `docker-compose.config.yml` and run the following commands:
+
+First make sure you have docker and docker composer installed, so please follow the install instructions for your OS/Distro:
+- https://docs.docker.com/engine/install/debian/
+- https://docs.docker.com/compose/install/
+
+After that:
+- Copy the config file called `docker-compose.config.example.yml` to `docker-compose.config.yml` with the values you want. Those that are left commented will use the default values.
+- Copy either `chibisafe.moe.http.example.conf` or `chibisafe.moe.https.example.conf` to `chibisafe.moe.conf` for either HTTP or HTTPS
+- - If using HTTPS make sure to put your certs into the `ssl` folder and name them accordingly:
+- - - `chibisafe.moe.crt` for the certificate
+- - - `chibisafe.moe.key` for the certificate key
+
+Once you are done run the following commands:
 
 - `cd docker`
 - `./chibisafe prod pull`