From dcb130c1c6efe24e0a39f9171776df49dcb8d063 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sat, 14 Dec 2019 17:01:04 +0000
Subject: [PATCH] Fix certbot github path (#2598)

---
 docker/init-selfcert.sh  | 6 +++---
 docker/install-local.sh  | 2 +-
 docker/install-server.sh | 2 +-
 docker/uninstall.sh      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/init-selfcert.sh b/docker/init-selfcert.sh
index 75cbdf9c8..ffa33a67b 100644
--- a/docker/init-selfcert.sh
+++ b/docker/init-selfcert.sh
@@ -17,8 +17,8 @@ fi
 if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then
   echo "### Downloading recommended TLS parameters ..."
   mkdir -p "$data_path/conf"
-  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
-  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
+  curl -s https://github.com/certbot/certbot/blob/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
+  curl -s https://github.com/certbot/certbot/blob/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
   echo
 fi
 
@@ -35,7 +35,7 @@ echo
 
 
 echo "### Starting nginx ..."
-docker-compose up --force-recreate -d nginx
+docker-compose -f ../docker-compose.yml up --force-recreate -d nginx
 echo
 
 
diff --git a/docker/install-local.sh b/docker/install-local.sh
index 9277fb5da..6a710e35e 100644
--- a/docker/install-local.sh
+++ b/docker/install-local.sh
@@ -10,6 +10,6 @@ fi
 
 . ./.env
 
-docker-compose build
+docker-compose -f ../docker-compose.yml build
 
 /bin/bash ./init-selfcert.sh
diff --git a/docker/install-server.sh b/docker/install-server.sh
index 4954c2a41..64dcd490e 100644
--- a/docker/install-server.sh
+++ b/docker/install-server.sh
@@ -10,6 +10,6 @@ fi
 
 . ./.env
 
-docker-compose build
+docker-compose -f ../docker-compose.yml build
 
 /bin/bash ./init-letsencrypt.sh
diff --git a/docker/uninstall.sh b/docker/uninstall.sh
index d101943ba..920afcdfb 100644
--- a/docker/uninstall.sh
+++ b/docker/uninstall.sh
@@ -4,4 +4,4 @@ cd docker
 
 . ./.env
 
-docker-compose down
+docker-compose -f ../docker-compose.yml down