From 2a3d25418653f8f12f1c397c8c6db152c138a0eb Mon Sep 17 00:00:00 2001
From: Austin <austin@Omega.local>
Date: Wed, 25 Mar 2020 12:36:27 -0500
Subject: [PATCH] Monolithinc Docker File

---
 .env                                | 10 +++++-----
 docker-compose.yml                  | 27 ++++++++++++++++++++++++---
 gitea/vhost/drone.07fi.net          |  2 --
 gitea/vhost/drone.07fi.net_location |  2 --
 proxy/vhost/default                 | 10 ++++++++++
 proxy/vhost/drone.07fi.net_location |  5 +++++
 6 files changed, 44 insertions(+), 12 deletions(-)
 delete mode 100644 gitea/vhost/drone.07fi.net
 delete mode 100644 gitea/vhost/drone.07fi.net_location
 create mode 100644 proxy/vhost/default
 create mode 100644 proxy/vhost/drone.07fi.net_location

diff --git a/.env b/.env
index 4bc2a0c..f02898a 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,9 @@
-DRONE_GITEA_SERVER=http://git.07fi.net:3000
-DRONE_GITEA_CLIENT_ID=6e80c400-ad17-4dda-b68e-0136b1677e37
-DRONE_GITEA_CLIENT_SECRET=bdRzHP9GqSvb7Dmqm7g1mkCHjXadXd74AEHtw8VPl8E=
+DRONE_GITEA_SERVER=https://git.07fi.net
+DRONE_GITEA_CLIENT_ID=da1cdbdd-a50d-4367-80d9-a8fdff8c652f
+DRONE_GITEA_CLIENT_SECRET=ftJDp0UdFgutif7K3XuFYZKAXCLaHZxKA-psdyS_LkE=
 DRONE_RPC_SECRET=a1cf994eee95899f31f296c25d8310f0
-DRONE_SERVER_HOST=drone.07fi.net:8000
-DRONE_SERVER_PROTO=http
+DRONE_SERVER_HOST=drone.07fi.net
+DRONE_SERVER_PROTO=https
 
 DRONE_RPC_PROTO=http
 DRONE_RPC_HOST=drone.07fi.net:8000
diff --git a/docker-compose.yml b/docker-compose.yml
index 0fdc2ba..3df25a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "2"
 services:
   nginx-proxy:
     image: jwilder/nginx-proxy
@@ -7,8 +7,28 @@ services:
       - "443:443"
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./gitea/vhost:/etc/nginx/vhost.d:ro
+      - ./proxy/vhost:/etc/nginx/vhost.d
+      - ./proxy/certs:/etc/nginx/certs
+      - /etc/nginx/certs
+      - /etc/nginx/vhost.d
+      - /usr/share/nginx/html
+    environment:
+      - DHPARAM_GENERATION=false
   
+  nginx-proxy-letsencrypt:
+     image: jrcs/letsencrypt-nginx-proxy-companion
+     volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+     environment:
+      - DEFAULT_EMAIL=07fi123@gmail.com
+     depends_on:
+      - gitea
+      - drone
+     volumes_from:
+      - nginx-proxy
+     networks:
+      - default
+
   gitea:
     image: gitea/gitea:1
     container_name: gitea
@@ -22,6 +42,7 @@ services:
     environment:
       - VIRTUAL_PORT=3000
       - VIRTUAL_HOST=git.07fi.net
+      - LETSENCRYPT_HOST=git.07fi.net
       - USER_UID=1000
       - USER_GID=1000
       - TZ=America/Chicago
@@ -55,8 +76,8 @@ services:
       - DRONE_DATABASE_DATASOURCE=/var/lib/drone/database.sqlite
       - DRONE_DATABASE_DRIVER=sqlite3
       - TZ=America/Chicago
-      - VIRTUAL_PORT=8000
       - VIRTUAL_HOST=drone.07fi.net
+      - LETSENCRYPT_HOST=drone.07fi.net
 
   drone-runner:
     image: drone/drone-runner-docker:1
diff --git a/gitea/vhost/drone.07fi.net b/gitea/vhost/drone.07fi.net
deleted file mode 100644
index 7d09790..0000000
--- a/gitea/vhost/drone.07fi.net
+++ /dev/null
@@ -1,2 +0,0 @@
-proxy_set_header X-Forwarded-For $remote_addr;
-proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/gitea/vhost/drone.07fi.net_location b/gitea/vhost/drone.07fi.net_location
deleted file mode 100644
index 7d09790..0000000
--- a/gitea/vhost/drone.07fi.net_location
+++ /dev/null
@@ -1,2 +0,0 @@
-proxy_set_header X-Forwarded-For $remote_addr;
-proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/proxy/vhost/default b/proxy/vhost/default
new file mode 100644
index 0000000..5e59aa4
--- /dev/null
+++ b/proxy/vhost/default
@@ -0,0 +1,10 @@
+## Start of configuration add by letsencrypt container
+location ^~ /.well-known/acme-challenge/ {
+    auth_basic off;
+    auth_request off;
+    allow all;
+    root /usr/share/nginx/html;
+    try_files $uri =404;
+    break;
+}
+## End of configuration add by letsencrypt container
diff --git a/proxy/vhost/drone.07fi.net_location b/proxy/vhost/drone.07fi.net_location
new file mode 100644
index 0000000..fe473e1
--- /dev/null
+++ b/proxy/vhost/drone.07fi.net_location
@@ -0,0 +1,5 @@
+# pass through headers
+proxy_set_header        X-Real-IP $remote_addr;
+proxy_set_header        X-Forwarded-For $remote_addr;
+proxy_set_header        X-Forwarded-Proto $scheme;
+