From 64c682ab7c49b23b699377cc5442fd196b5e1e46 Mon Sep 17 00:00:00 2001 From: kexkey Date: Fri, 21 Dec 2018 14:36:48 -0500 Subject: [PATCH] Fixed nginx file rights and moved touch installation.json in setup --- api_auth_docker/entrypoint.sh | 3 ++- dist/setup.sh | 2 ++ .../generators/app/templates/installer/start.sh | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/api_auth_docker/entrypoint.sh b/api_auth_docker/entrypoint.sh index 158b281..b464185 100644 --- a/api_auth_docker/entrypoint.sh +++ b/api_auth_docker/entrypoint.sh @@ -11,6 +11,7 @@ if [[ $1 ]]; then fi +chmod -R g+rw /var/run/fcgiwrap.socket /etc/nginx/conf.d/* +chown -R :nginx /etc/nginx/conf.d/* spawn-fcgi -M 0660 -s /var/run/fcgiwrap.socket -u $user -g nginx -U $user -- `which fcgiwrap` -chmod g+rw /var/run/fcgiwrap.socket nginx -g "daemon off;" diff --git a/dist/setup.sh b/dist/setup.sh index fc7efe5..6fb1977 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -359,6 +359,8 @@ install_docker() { if [ ! -d $GATEKEEPER_DATAPATH ]; then step " create $GATEKEEPER_DATAPATH" sudo_if_required mkdir -p $GATEKEEPER_DATAPATH + # prevent mounting installation.json as a directory + sudo_if_required touch $GATEKEEPER_DATAPATH/installation.json next fi diff --git a/install/generator-cyphernode/generators/app/templates/installer/start.sh b/install/generator-cyphernode/generators/app/templates/installer/start.sh index 81a132a..5ba6fad 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/start.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/start.sh @@ -15,11 +15,6 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>) export ARCH=$(uname -m) current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)" -if [[ ! -e <%= gatekeeper_datapath %>/installation.json ]]; then - # prevent mounting installation.json as a directory - touch <%= gatekeeper_datapath %>/installation.json -fi - <% if (docker_mode == 'swarm') { %> docker stack deploy -c $current_path/docker-compose.yaml cyphernode <% } else if(docker_mode == 'compose') { %>