move nginx static config to build (#190)
move nginx static config to build...
This commit is contained in:
		
							parent
							
								
									288b91a0cd
								
							
						
					
					
						commit
						538f19d0b2
					
				@ -120,10 +120,6 @@ if [ "$1" = 'zammad-nginx' ]; then
 | 
			
		||||
  check_zammad_ready
 | 
			
		||||
 | 
			
		||||
  # configure nginx
 | 
			
		||||
  sed -i -e "s#user www-data;##g" \
 | 
			
		||||
         -e 's#/var/log/nginx/\(access\|error\).log#/dev/stdout#g' \
 | 
			
		||||
         -e 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf
 | 
			
		||||
 | 
			
		||||
  sed -e "s#proxy_set_header X-Forwarded-Proto .*;#proxy_set_header X-Forwarded-Proto ${NGINX_SERVER_SCHEME};#g" \
 | 
			
		||||
      -e "s#server .*:3000#server ${ZAMMAD_RAILSSERVER_HOST}:${ZAMMAD_RAILSSERVER_PORT}#g" \
 | 
			
		||||
      -e "s#server .*:6042#server ${ZAMMAD_WEBSOCKET_HOST}:${ZAMMAD_WEBSOCKET_PORT}#g" \
 | 
			
		||||
 | 
			
		||||
@ -36,8 +36,9 @@ if [ "$1" = 'builder' ]; then
 | 
			
		||||
  chown -R "${ZAMMAD_USER}":"${ZAMMAD_USER}" "${ZAMMAD_TMP_DIR}"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# set nginx file permissions
 | 
			
		||||
# set nginx file permissions and settings
 | 
			
		||||
if [ "$1" = 'runner' ]; then
 | 
			
		||||
  sed -i -e "s#user www-data;##g" -e 's#/var/log/nginx/\(access\|error\).log#/dev/stdout#g' -e 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf
 | 
			
		||||
  mkdir -p "${ZAMMAD_DIR}" /var/log/nginx
 | 
			
		||||
  chown -R "${ZAMMAD_USER}":"${ZAMMAD_USER}" /etc/nginx "${ZAMMAD_DIR}" /var/lib/nginx /var/log/nginx
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user