Browse Source

Fix fix of #7

Dennis Rodewyk 6 years ago
parent
commit
5f4f97e23b
2 changed files with 7 additions and 5 deletions
  1. 2 2
      data/include/functions/setup_functions.sh
  2. 5 3
      data/services/nginx/nginx.sh

+ 2 - 2
data/include/functions/setup_functions.sh

@@ -215,8 +215,8 @@ generate_certificate() {
 basic_nginx() {
 	if [[ -z $reinstall ]];then
 		[[ ! -d "${CONF_DIR}"/nginx/ssl ]] \
-			&& mkdir -p "${CONF_DIR}"/nginx/ssl \
-			&& cp -r "${SERVICES_DIR}"/nginx/* "${CONF_DIR}"/nginx/ssl \
+			&& mkdir -p "${CONF_DIR}"/nginx/ssl
+		[[ ! -f "${CONF_DIR}"/nginx/ssl/dhparam.pem ]] \
 			&& cp "${SERVICES_DIR}/nginx/ssl/dhparam.pem" "${CONF_DIR}"/nginx/ssl
 		[[ ! -d "${CONF_DIR}"/nginx/ssl/${SERVICE_DOMAIN[0]} ]] && \
 			mkdir -p "${CONF_DIR}"/nginx/ssl/${SERVICE_DOMAIN[0]}

+ 5 - 3
data/services/nginx/nginx.sh

@@ -28,11 +28,13 @@ setup() {
 		&& docker network create $NETWORK >/dev/null
 
 	[[ ! -d "${CONF_DIR}"/nginx/ssl ]] \
-		&& mkdir -p "${CONF_DIR}"/nginx/ssl \
-		&& cp -r "${SERVICES_DIR}"/nginx/* "${CONF_DIR}"/nginx/ssl \
+		&& mkdir -p "${CONF_DIR}"/nginx/ssl
+
+	[[ ! -f "${CONF_DIR}"/nginx/ssl/dhparam.pem ]] \
 		&& cp "${SERVICES_DIR}/nginx/ssl/dhparam.pem" "${CONF_DIR}"/nginx/ssl
 
-	[[ ! -d "${BASE_DIR}"/data/web ]] && mkdir "${BASE_DIR}"/data/web
+	[[ ! -d "${BASE_DIR}"/data/web ]] \
+		&& mkdir "${BASE_DIR}"/data/web
 
 	docker_run nginx_dockerbunker
 }