Fixed nginx file rights and moved touch installation.json in setup

This commit is contained in:
kexkey
2018-12-21 14:36:48 -05:00
parent 7d8196469e
commit 64c682ab7c
3 changed files with 4 additions and 6 deletions

View File

@@ -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;"

2
dist/setup.sh vendored
View File

@@ -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

View File

@@ -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') { %>