From 25d4fa40cc1e251926b061b2c8eba4058f912aa7 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 22 May 2023 22:00:46 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/defaults.inc b/defaults.inc index a4f5edbc..b303da59 100755 --- a/defaults.inc +++ b/defaults.inc @@ -17,7 +17,9 @@ GLHOSTS=10.10.1.41,10.10.1.42,10.10.1.121,10.10.1.122 PWHOSTS=10.10.0.240 WMHOSTS=100.73.162.81 -NODESERVICES=mariadb,mysql,nginx,gitea,pdnsadmin,pdnsadmin.socket,haproxy,keepalived,maxscale,postgresql,web,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,syncthing,pdns,proxysql,radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,glusterd,redis-server,mosquitto,tailscaled,cmon +NODESERVICES="mariadb,mysql,nginx,gitea,pdnsadmin,pdnsadmin.socket,haproxy,keepalived,maxscale,postgresql,web,php5.6-fpm,php7.2-fpm,php7.3-fpm" +NODESERVICES="${NODESERVICES},php7.4-fpm,syncthing,pdns,proxysql,radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,glusterd" +NODESERVICES="${NODESERVICES},redis-server,mosquitto,tailscaled,cmon,monitor-power,monitor-temp" 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 @@ -25,11 +27,12 @@ NCSERVICES_CHECK=nginx,php8.1-fpm,redis-server WPDSERVICES_CHECK=pdns,nginx,mariadb,pdnsadmin,pdnsadmin.socket,proxysql,tailscaled LPDSERVICES_CHECK=pdns,nginx,mariadb,pdnsadmin,pdnsadmin.socket,keepalived MMSERVICES_CHECK=radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,nginx,php8.2-fpm -PWSERVICES_CHECK=mosquitto +PWSERVICES_CHECK=mosquitto,monitor-power,monitor-temp WMSERVICES_CHECK=nginx,tailscaled WEBDOCKER=phpmyadmin,phppgadmin WMDOCKER=uptime-kuma +PWDOCKER=uptime-kuma #LBDOCKER=nginx-proxy_manager noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck ' @@ -61,19 +64,19 @@ NM_HOSTNAMES['10.10.1.121']='Webserver-Node1' NM_HOSTNAMES['10.10.1.122']='Webserver-Node2' 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.81']='LoadBalancer-Node1' +NM_HOSTNAMES['10.10.10.82']='LoadBalancer-Node2' +NM_HOSTNAMES['10.10.10.10']='LAN-DNS-Node1' +NM_HOSTNAMES['10.10.10.11']='LAN-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.240']='PowerWall' -NM_HOSTNAMES['100.90.74.120']='WAN-DNS1 (East)' -NM_HOSTNAMES['100.123.225.4']='WAN-DNS2 (West)' +NM_HOSTNAMES['10.10.0.240']='PowerWall-Server' +NM_HOSTNAMES['100.90.74.120']='WAN-DNS-Node1 (East)' +NM_HOSTNAMES['100.123.225.4']='WAN-DNS-Node2 (West)' NM_HOSTNAMES['100.73.162.81']='WAN-Monitor-Node1' - +NM_HOSTNAMES['3.214.174.170']='WAN-DNS-Node1 (East)' +NM_HOSTNAMES['54.213.11.227']='WAN-DNS-Node2 (West)' +NM_HOSTNAMES['44.214.59.192']='WAN-Monitor-Node1' declare -i errtime @@ -155,6 +158,9 @@ NM_SERVICES['glusterd']='Gluster FileSystem' NM_SERVICES['redis-server']='Redis Caching Server' NM_SERVICES['mosquitto']='Mosquitto MQTT Broker' NM_SERVICES['tailscaled']='Tailscale P2P VPN' +NM_SERVICES['monitor-power']='Server Power Monitor' +NM_SERVICES['monitor-temp']='Server Temp Monitor' + declare -A NM_DOCKERS NM_DOCKERS['phpmyadmin']='phpMyAdmin'