diff --git a/defaults.inc b/defaults.inc index 125347ad..92be01c0 100755 --- a/defaults.inc +++ b/defaults.inc @@ -23,7 +23,7 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then IFS=, - NODE_TYPES=(${NODETYPES}) + # NODE_TYPES=(${NODETYPES}) MYSQL_HOSTS=(${MYSQLHOSTS}) WEB_HOSTS=(${WEBHOSTS}) LB_HOSTS=(${LBHOSTS}) @@ -54,15 +54,18 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then WEB_SINGLESRVR_SERVICES=(${WEB_SINGLESRVRSERVICES}) WEB_SINGLESRVR_DOCKERS=(${WEB_SINGLESRVRDOCKERS}) - unset IFS - + declare -A NODE_TYPES + for nmtype in "${NM_HOSTS[@]}"; do + NODE_TYPES+=${nmtype} + done + for ntype in "${NODE_TYPES[@]}"; do - IFS=, - var=(${NM_HOSTS[${ntype}]}) - unset IFS - declare "NM_HOSTS_${ntype}"=$var + echo $ntype + # var=(${NM_HOSTS[${ntype}]}) + # declare "NM_HOSTS_${ntype}"=$var done + unset IFS fi diff --git a/defaults.local.inc b/defaults.local.inc index 7a2d3d90..5b904856 100755 --- a/defaults.local.inc +++ b/defaults.local.inc @@ -1,6 +1,9 @@ # NODETYPES=WEB -NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB + +NODEMANAGER=10.10.10.50 + +# NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB MYSQLHOSTS=10.10.1.51,10.10.1.52 WEBHOSTS=10.10.1.121,10.10.1.122 @@ -14,8 +17,6 @@ GLHOSTS=10.10.1.41,10.10.1.42,10.10.1.121,10.10.1.122 PWHOSTS=10.10.0.240 WMHOSTS=100.100.55.5 -NODEMANAGER=10.10.10.50 - declare -A NM_HOSTS NM_HOSTS['MYSQL']=10.10.1.51,10.10.1.52 NM_HOSTS['WEB']=10.10.1.121,10.10.1.122 @@ -28,6 +29,7 @@ NM_HOSTS['MM']=10.10.1.24 NM_HOSTS['PW']=10.10.0.240 NM_HOSTS['WM']=100.100.55.5 + MYSQLSERVICES_CHECK=mariadb,proxysql,keepalived WEBSERVICES_CHECK=nginx,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.2-fpm,gitea,keepalived LBSERVICES_CHECK=nginx,haproxy,keepalived