From 9c27257ccef717e3e8a3ec32d15947531f413202 Mon Sep 17 00:00:00 2001
From: lza_menace <lza_menace@protonmail.com>
Date: Wed, 8 Jul 2020 23:25:59 -0700
Subject: [PATCH] making some adjustments to variables and secrets

---
 docker-compose.yaml | 37 ++++---------------------------------
 env.example         |  1 +
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 491c54f..4fb7925 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,35 +1,12 @@
 version: '3'
 services:
-  reverse-proxy:
-    image: traefik:v2.2
-    command:
-      # Try to enable this if something isn't working. Chances are, Traefik will tell you why
-      # Be careful on production as it exposes the traffic you might not want to expose
-      # --log.level=DEBUG
-      # --api.dashboard=true
-      # --api.insecure=true
-
-      --entrypoints.http.address=:80
-      --entrypoints.https.address=:443
-      --providers.docker=true
-      --api=false
-      --certificatesresolvers.letsencrypt.acme.httpchallenge=true
-      --certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=http
-      --certificatesresolvers.letsencrypt.acme.email=${ACME_EMAIL}
-      --certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json
-    restart: always
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_DIR}/letsencrypt:/letsencrypt
   drone-server:
     image: drone/drone:1
     container_name: drone-server
     restart: always
     ports:
-      - 8000:80
+      - 80:80
+      - 443:443
     volumes:
       - ${DATA_DIR}/drone-server:/data
     environment:
@@ -43,13 +20,7 @@ services:
       DRONE_SERVER_PROTO: ${DRONE_SERVER_PROTO}
       DRONE_USER_FILTER: ${DRONE_USER}
       DRONE_USER_CREATE: username:${DRONE_USER},admin:true
-    labels:
-      - "traefik.http.routers.https.rule=Host(`${DRONE_SERVER_HOST}`)"
-      - "traefik.http.routers.http.rule=Host(`${DRONE_SERVER_HOST}`)"
-      - "traefik.http.routers.https.entrypoints=https"
-      - "traefik.http.routers.http.entrypoints=http"
-      - "traefik.http.routers.https.tls=true"
-      - "traefik.http.routers.https.tls.certresolver=letsencrypt"
+      DRONE_TLS_AUTOCERT: ${DRONE_TLS_AUTOCERT}
   drone-runner:
     image: drone/drone-runner-docker:1
     ports:
@@ -59,7 +30,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      DRONE_RPC_PROTO: ${DRONE_SERVER_PROTO}
+      DRONE_RPC_PROTO: http
       DRONE_RPC_HOST: drone-server
       DRONE_RPC_SECRET: ${DRONE_RPC_SECRET}
       DRONE_RUNNER_CAPACITY: ${DRONE_RUNNER_CAPACITY}
diff --git a/env.example b/env.example
index 8fd010b..e9b9ea7 100644
--- a/env.example
+++ b/env.example
@@ -8,6 +8,7 @@ DRONE_REGISTRATION_CLOSED=false
 DRONE_USER=xxxx
 DRONE_COOKIE_TIMEOUT=72h
 DRONE_COOKIE_SECRET=xxxx
+DRONE_TLS_AUTOCERT=true
 
 DRONE_RUNNER_CAPACITY=2
 DRONE_RUNNER_NAME=xxxxx