Starting node with generated config

4 files changed, 26 insertions, 8 deletions

diff --git a/rabbitmq.conf.d/rabbitmq.conf b/rabbitmq.conf.d/rabbitmq.conf
index 06e470d6e0..e702ec08b4 100644
--- a/rabbitmq.conf.d/rabbitmq.conf
+++ b/rabbitmq.conf.d/rabbitmq.conf
@@ -27,7 +27,7 @@ listener.tcp.default = 5672
 ## SSL listeners are configured in the same fashion as TCP listeners,
 ## including the option to control the choice of interface.
 ##
-listener.ssl.default = 5671
+# listener.ssl.default = 5671
 
 ## Number of Erlang processes that will accept connections for the TCP
 ## and SSL listeners.
@@ -394,7 +394,7 @@ queue_index_embed_msgs_below = 4kb
 # QA: Maybe use IP type like in tcp_listener?
 management.listener.port = 12345
 management.listener.ip   = 127.0.0.1
-management.listener.ssl  = true
+# management.listener.ssl  = true
 
 # management.listener.ssl_opts.cacertfile = /path/to/cacert.pem
 # management.listener.ssl_opts.certfile   = /path/to/cert.pem
@@ -411,7 +411,7 @@ management.rates_mode = basic
 ## Your can use 'minute', 'hour' and '24hours' keys or integer key (in seconds)
 management.sample_retention_policies.global.minute    = 5
 management.sample_retention_policies.global.hour  = 60
-management.sample_retention_policies.global.24hours = 1200
+management.sample_retention_policies.global.day = 1200
 
 management.sample_retention_policies.basic.minute   = 5
 management.sample_retention_policies.basic.hour = 60
@@ -443,7 +443,7 @@ stomp.listener.tcp.default = 61613
 
 ## Same for ssl listeners
 ##
-stomp.listener.ssl.default = 61614
+# stomp.listener.ssl.default = 61614
 
 ## Number of Erlang processes that will accept connections for the TCP
 ## and SSL listeners.
@@ -525,7 +525,7 @@ mqtt.listener.tcp.default = 1883
 
 ## Same for ssl listener
 ##
-mqtt.listener.ssl.default = 1884
+# mqtt.listener.ssl.default = 1884
 
 ## Number of Erlang processes that will accept connections for the TCP
 ## and SSL listeners.
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index c5d87822a2..e74c0da115 100644
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -38,6 +38,7 @@ CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
 LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
 MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
 ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
+GENERATED_CONFIG_DIR=${SYS_PREFIX}/var/lib/rabbitmq/config
 
 PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
 IO_THREAD_POOL_SIZE=64
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index e4f89e2658..a197ec31ba 100644
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -183,6 +183,7 @@ DEFAULT_NODE_PORT=5672
 [ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS}
 [ "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_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR}
 
 rmq_normalize_path_var \
     RABBITMQ_CONFIG_FILE \
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 6397d1cdbd..9f28086ab4 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -58,9 +58,25 @@ esac
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 
+generate_config() {
+    rm -rf ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config
+    ./cuttlefish -e ${RABBITMQ_GENERATED_CONFIG_DIR} -s ./schema -c ${RABBITMQ_CONFIG_FILE}.conf -f rabbitmq
+    mv ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.*.config ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config
+}
+
+if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
+    RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE
+else
+     
+    [ -f "${RABBITMQ_CONFIG_FILE}.conf" ] && 
+    [ "x" != "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && 
+    generate_config && 
+    RABBITMQ_CONFIG_FILE_ACTUAL="${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq"
+fi
+
 set +e
 
-RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE_ACTUAL \
 RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
     -boot "${CLEAN_BOOT_FILE}" \
@@ -84,7 +100,7 @@ fi
 set -e
 
 RABBITMQ_CONFIG_ARG=
-[ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
+[ -f "${RABBITMQ_CONFIG_FILE_ACTUAL}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_ACTUAL}"
 
 RABBITMQ_LISTEN_ARG=
 [ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]"
@@ -106,7 +122,7 @@ fi
 set -f
 
 start_rabbitmq_server() {
-    RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+    RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE_ACTUAL \
     exec ${ERL_DIR}erl \
         -pa ${RABBITMQ_EBIN_ROOT} \
         ${RABBITMQ_START_RABBIT} \