From 88b38fa9339841d5ba8fdefb1154f1c4c8dfe165 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 19 Mar 2023 17:04:42 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/defaults.inc b/defaults.inc index 7d82bc50..1d1e1ba1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -2,12 +2,13 @@ VERS='3.03192023' #NODETYPES=LB -NODETYPES=MYSQL,LB,WEB,NC,PD,MM,PW +NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW MYSQLHOSTS=10.10.1.51,10.10.1.52 WEBHOSTS=10.10.1.121,10.10.1.122 LBHOSTS=10.10.10.81,10.10.10.82 NCHOSTS=10.10.10.42 -PDHOSTS=159.203.158.51,146.190.1.194,10.10.10.10,10.10.10.11 +WPDHOSTS=159.203.158.51,146.190.1.194 +LPDHOSTS=10.10.10.10,10.10.10.11 MMHOSTS=10.10.1.24 PRIMARYHOST=10.10.1.51 MYSQLMANAGER=10.10.10.50 @@ -19,7 +20,8 @@ MYSQLSERVICES_CHECK=mariadb,proxysql,keepalived WEBSERVICES_CHECK=nginx,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.2-fpm,gitea,pdnsadmin,pdnsadmin.socket,keepalived,glusterd LBSERVICES_CHECK=haproxy,keepalived NCSERVICES_CHECK=nginx,php8.1-fpm,redis-server -PDSERVICES_CHECK=pdns,mariadb +WPDSERVICES_CHECK=pdns,mariadb +LPDSERVICES_CHECK=pdns,mariadb,pdnsadmin,pdnsadmin.socket,keepalived MMSERVICES_CHECK=radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,nginx,php8.2-fpm PWSERVICES_CHECK=mosquitto @@ -41,11 +43,13 @@ NM_HOSTNAMES['10.10.1.51']='MySQL-Node1' NM_HOSTNAMES['10.10.1.52']='MySQL-Node2' NM_HOSTNAMES['10.10.10.81']='LB-Node1' NM_HOSTNAMES['10.10.10.82']='LB-Node2' +NM_HOSTNAMES['10.10.10.10']='DNS-Node1' +NM_HOSTNAMES['10.10.10.11']='DNS-Node2' NM_HOSTNAMES['10.10.10.42']='Nextcloud-Server' NM_HOSTNAMES['159.203.158.51']='PowerDNS-Node1' NM_HOSTNAMES['146.190.1.194']='PowerDNS-Node3' NM_HOSTNAMES['10.10.10.50']='MySQL-Manager' -NM_HOSTNAMES['10.10.0.2400']='PowerWall' +NM_HOSTNAMES['10.10.0.240']='PowerWall' declare -i errtime @@ -59,14 +63,16 @@ NC_HOSTS=(${NCHOSTS}) PD_HOSTS=(${PDHOSTS}) MM_HOSTS=(${MMHOSTS}) GL_HOSTS=(${GLHOSTS}) -PW_HOSTS=(${PWHOSTS}) +WPW_HOSTS=(${WPWHOSTS}) +LPW_HOSTS=(${LPWHOSTS}) NODE_SERVICES=(${NODESERVICES}) MYSQL_SERVICES_CHECK=(${MYSQLSERVICES_CHECK}) WEB_SERVICES_CHECK=(${WEBSERVICES_CHECK}) LB_SERVICES_CHECK=(${LBSERVICES_CHECK}) NC_SERVICES_CHECK=(${NCSERVICES_CHECK}) -PD_SERVICES_CHECK=(${PDSERVICES_CHECK}) +WPD_SERVICES_CHECK=(${WPDSERVICES_CHECK}) +LPD_SERVICES_CHECK=(${LPDSERVICES_CHECK}) MM_SERVICES_CHECK=(${MMSERVICES_CHECK}) PW_SERVICES_CHECK=(${PWSERVICES_CHECK}) LOCAL_SERVICES=(${LOCAL_SERVICES}) @@ -81,7 +87,8 @@ NM_NODETYPES['MYSQL']='MySQL' NM_NODETYPES['LB']='LoadBalance' NM_NODETYPES['WEB']='Webserver' NM_NODETYPES['NC']='Nextcloud' -NM_NODETYPES['PD']='PowerDNS' +NM_NODETYPES['WPD']='WAN PowerDNS' +NM_NODETYPES['LPD']='LAN PowerDNS' NM_NODETYPES['MM']='Media Manager' NM_NODETYPES['PW']='PowerWall'