Split out the environment variable munging as described in the ticket, except for those variables which are
derived from other variables.
This commit is contained in:
		
							parent
							
								
									6381790521
								
							
						
					
					
						commit
						1dc3656ffd
					
				| 
						 | 
				
			
			@ -29,23 +29,23 @@
 | 
			
		|||
##
 | 
			
		||||
##   Contributor(s): ______________________________________.
 | 
			
		||||
##
 | 
			
		||||
NODENAME=rabbit
 | 
			
		||||
NODE_IP_ADDRESS=0.0.0.0
 | 
			
		||||
NODE_PORT=5672
 | 
			
		||||
SCRIPT_HOME=$(dirname $0)
 | 
			
		||||
PIDS_FILE=/var/lib/rabbitmq/pids
 | 
			
		||||
MULTI_ERL_ARGS=
 | 
			
		||||
MULTI_START_ARGS=
 | 
			
		||||
 | 
			
		||||
[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
 | 
			
		||||
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672
 | 
			
		||||
[ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME}
 | 
			
		||||
[ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=$(dirname $0)
 | 
			
		||||
[ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE}
 | 
			
		||||
[ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=/var/lib/rabbitmq/pids
 | 
			
		||||
[ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS}
 | 
			
		||||
[ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=
 | 
			
		||||
[ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${MULTI_START_ARGS}
 | 
			
		||||
[ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=
 | 
			
		||||
 | 
			
		||||
export \
 | 
			
		||||
    RABBITMQ_NODENAME \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,28 +30,29 @@
 | 
			
		|||
##   Contributor(s): ______________________________________.
 | 
			
		||||
##
 | 
			
		||||
 | 
			
		||||
NODENAME=rabbit
 | 
			
		||||
NODE_IP_ADDRESS=0.0.0.0
 | 
			
		||||
NODE_PORT=5672
 | 
			
		||||
SERVER_ERL_ARGS="+K true +A30 \
 | 
			
		||||
-kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
 | 
			
		||||
-kernel inet_default_connect_options [{nodelay,true}]"
 | 
			
		||||
CLUSTER_CONFIG_FILE=/etc/rabbitmq/cluster.config
 | 
			
		||||
LOG_BASE=/var/log/rabbitmq
 | 
			
		||||
MNESIA_BASE=/var/lib/rabbitmq/mnesia
 | 
			
		||||
SERVER_START_ARGS=
 | 
			
		||||
 | 
			
		||||
[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
 | 
			
		||||
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 | 
			
		||||
[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672
 | 
			
		||||
[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS}
 | 
			
		||||
[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS="+K true +A30 \
 | 
			
		||||
-kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
 | 
			
		||||
-kernel inet_default_connect_options [{nodelay,true}]"
 | 
			
		||||
[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
 | 
			
		||||
[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
 | 
			
		||||
[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 | 
			
		||||
[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq
 | 
			
		||||
[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}
 | 
			
		||||
[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia
 | 
			
		||||
[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
 | 
			
		||||
[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}
 | 
			
		||||
[ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS}
 | 
			
		||||
[ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=
 | 
			
		||||
 | 
			
		||||
## Log rotation
 | 
			
		||||
[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue