cleaning up docker-compose.yml and friends

README.md

@@ -11,7 +11,7 @@ Copy .env.example as .env and run the setup under the commands provided:
 
 *Docker*:
 
-   You can run the panel using this command: 
+You can run the panel using this command: 
 `docker run --name=pterodactyl-panel -p 80:80 -p 443:443 --env-file=./.env quay.io/ccarney/pterodactyl-panel:testing`.
 
 <sup>* This command alone does not provide the full environment for the panel. This is more or less a reference. If you wish to have a full environment, it is recommended to use the method below.</sup>
@@ -20,10 +20,10 @@ __or__
 
 *Docker Compose*:
 
-&nbsp;&nbsp;&nbsp;A *docker-compose.yml* file is provided for anyone who uses docker compose.
+A *docker-compose.yml* file is provided for anyone who uses docker compose.
 You can start the panel by running `docker-compose up -d`.
 
-&nbsp;&nbsp;&nbsp;*docker-compose.other.yml* provides mysql and the Let's Encrypt certbot services. If you want to use those services, you can symlink or copy it as *docker-compose.override.yml*. 
+*docker-compose.other.yml* provides mysql and the Let's Encrypt certbot services. If you want to use those services, you can symlink or copy it as *docker-compose.override.yml*. 
 
 ### The _/data_ Volume ###
 

docker-compose.other.yml

@@ -6,14 +6,14 @@ version: '2'
 services:
 
 ##
-# On initial setup, run "docker-compose run --rm certbot certonly --webroot -w /le-webroot 
+# On initial setup, run "docker-compose run --rm certbot certonly --webroot -w /ssl/.webroot
 # -d <domain>" to recieve a certificate
 ##
-  certbot:
-    command: renew
-    image: certbot/certbot:v1.13.0
-    volumes:
-    - ./certs:/etc/letsencrypt
+  # certbot:
+  #   command: renew
+  #   image: certbot/certbot:v1.13.0
+  #   volumes:
+  #   - ./ssl:/etc/letsencrypt
 
 ##
 # If you rely on another MySQL/MariaDB instance, this can be safely removed.
@@ -26,4 +26,7 @@ services:
     image: mariadb:10.1
   panel:
     depends_on:
-    - mysql
\ No newline at end of file
+    - mysql
+    volumes:
+    - ./ssl:/ssl
+    - ./ssl/.webroot/.well-known:/var/www/html/public/.well-known
\ No newline at end of file

docker-compose.yml

@@ -27,8 +27,6 @@ services:
     volumes:
     - ./data:/data
 
-    # - ./certs:/certs
-
 ##
 # If you don't plan on running the daemon on the same machine, comment the section below.
 ##