From d61c6b89c7efcf5fe045afcd16dd075ef93c127c Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Mon, 9 Nov 2020 15:20:04 +0100
Subject: [PATCH] Revert nginx

---
 openvidu-server/docker/openvidu-proxy/Dockerfile    | 4 +---
 openvidu-server/docker/openvidu-proxy/entrypoint.sh | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/openvidu-server/docker/openvidu-proxy/Dockerfile b/openvidu-server/docker/openvidu-proxy/Dockerfile
index 7198f9aa..3eb033f3 100644
--- a/openvidu-server/docker/openvidu-proxy/Dockerfile
+++ b/openvidu-server/docker/openvidu-proxy/Dockerfile
@@ -10,10 +10,8 @@ RUN apk update && \
             perl pcre grep && \
     rm -rf /var/cache/apk/*
 
-# Copy certbot default config
-COPY ./default-certbot.conf /default-nginx-certbot-conf/default-certbot.conf
-
 # Default nginx conf
+COPY ./default.conf /etc/nginx/conf.d/default.conf
 COPY ./default_nginx_conf /default_nginx_conf
 
 # Entrypoint and discover public ip scripts
diff --git a/openvidu-server/docker/openvidu-proxy/entrypoint.sh b/openvidu-server/docker/openvidu-proxy/entrypoint.sh
index 3c2fc897..3a4fbdb2 100755
--- a/openvidu-server/docker/openvidu-proxy/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-proxy/entrypoint.sh
@@ -102,8 +102,7 @@ fi
 echo -e "${DOMAIN_OR_PUBLIC_IP}\t${CERTIFICATE_TYPE}" > "${CERTIFICATES_CONF}"
 
 # Start with default certbot conf
-cp /default-nginx-certbot-conf/default-certbot.conf /etc/nginx/vhost.d/default-certbot.conf
-sed -i "s/{http_port}/${PROXY_HTTP_PORT}/" /etc/nginx/vhost.d/default-certbot.conf
+sed -i "s/{http_port}/${PROXY_HTTP_PORT}/" /etc/nginx/conf.d/default.conf
 nginx -g "daemon on;"
 
 case ${CERTIFICATE_TYPE} in
@@ -187,8 +186,7 @@ Welcome to OpenVidu Server
 EOF
 
 # Load nginx conf files
-rm /etc/nginx/conf.d/*
-rm /etc/nginx/vhost.d/default-certbot.conf
+rm /etc/nginx/conf.d/default*.conf
 cp /default_nginx_conf/default* /etc/nginx/conf.d
 
 # Replace config files