diff --git a/defaults.inc b/defaults.inc index a1e16674..58bebc8f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -5,7 +5,7 @@ NODETYPES=MYSQL,LB,WEB,NC,PD,MM 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.1.42 +NCHOSTS=10.10.1.41,10.10.1.42,10.10.1.43 PDHOSTS=159.203.158.51,45.55.107.166 MMHOSTS=10.10.1.24 PRIMARYHOST=10.10.1.51 @@ -15,7 +15,7 @@ MYSQLSERVICES_CHECK=mysql,proxysql,keepalived # WEBSERVICES_CHECK=nginx,gitea,powerdns-admin,keepalived,php5.6-fpm,php7.2-fpm,php7.3-fpm WEBSERVICES_CHECK=nginx,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.0-fpm,php8.1-fpm,gitea,powerdns-admin,keepalived,syncthing LBSERVICES_CHECK=haproxy,keepalived -NCSERVICES_CHECK=nginx,php7.4-fpm +NCSERVICES_CHECK=apache2,php8.1-fpm,syncthing PDSERVICES_CHECK=pdns,mariadb MMSERVICES_CHECK=radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,nginx,php8.1-fpm noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes ' @@ -56,13 +56,14 @@ declare -A NM_SERVICES NM_SERVICES['mysql']='MySQL' NM_SERVICES['mariadb']='MariaDB (MySQL)' NM_SERVICES['postgresql']='PostgreSQL' -NM_SERVICES['nginx']='NGINX' -NM_SERVICES['gogs']='Gogs' -NM_SERVICES['gitea']='Gitea' +NM_SERVICES['apache2']='Apache Web Server' +NM_SERVICES['nginx']='NGINX Web Server' +NM_SERVICES['gogs']='Gogs Git Repository' +NM_SERVICES['gitea']='Gitea Git Repository' NM_SERVICES['powerdns-admin']='PowerDNS-Admin' -NM_SERVICES['haproxy']='HAProxy' -NM_SERVICES['keepalived']='Keepalived' -NM_SERVICES['maxscale']='MaxScale' +NM_SERVICES['haproxy']='HAProxy Load Balancer' +NM_SERVICES['keepalived']='Keepalived Load Balancer' +NM_SERVICES['maxscale']='MaxScale Load Balancer' NM_SERVICES['cmon']='CC-Controller' NM_SERVICES['cmon-events']='CC-Events Manager' NM_SERVICES['cmon-cloud']='CC-Cloud Daemon' @@ -74,7 +75,7 @@ NM_SERVICES['php8.0-fpm']='PHP 8.0 FPM' NM_SERVICES['php8.1-fpm']='PHP 8.1 FPM' NM_SERVICES['syncthing']='Syncthing' NM_SERVICES['pdns']='PowerDNS Server' -NM_SERVICES['proxysql']='ProxySQL' +NM_SERVICES['proxysql']='ProxySQL Load Balancer' NM_SERVICES['radarr']='Radarr' NM_SERVICES['sonarr']='Sonarr' NM_SERVICES['jackett']='Jackett' @@ -95,6 +96,7 @@ NM_SRVCOPTS['daemon-reload']='Daemon-Reload' NM_SRVCOPT=(start stop restart reload enable disable) declare -A REPL_CHECKS +REPL_CHECKS['apache']='/etc/apache2' REPL_CHECKS['nginx']='/etc/nginx' REPL_CHECKS['ssl']='/etc/letsencrypt' REPL_CHECKS['lessh']='/home/le/.ssh' @@ -104,15 +106,15 @@ REPL_CHECKS['git']='/var/lib/gitea' REPL_CHECKS['gitssh']='/home/git' REPL_CHECKS['pma']='/etc/phpmyadmin' REPL_CHECKS['pdnsa']='/opt/powerdns-admin' -#REPL_CHECKS['nextcloud-data']='/mnt/Nextcloud-Data/cloud-Data' -#REPL_CHECKS['nextcloud-www']='/mnt/Nextcloud-Data/www-Data' +REPL_CHECKS['nextcloud-data']='/mnt/Nextcloud-Data' MYSQL_REPL_CHECK=( ) WEB_REPL_CHECK=(nginx www ssl lessh php pma pdnsa) LB_REPL_CHECK=( ) -#NC_REPL_CHECK=(nginx nextcloud-data nextcloud-www) +NC_REPL_CHECK=(apache nextcloud-data) declare -A REPL_DESC +REPL_DESC['apache']='Apache Settings' REPL_DESC['nginx']='NGINX Settings' REPL_DESC['ssl']='SSL Certificates' REPL_DESC['lessh']='LetsEncrypt SSH Keys' @@ -123,7 +125,6 @@ REPL_DESC['gitssh']='Gitea SSH Keys' REPL_DESC['pma']='phpMyAdmin Settings' REPL_DESC['pdnsa']='PowerDNS Admin' REPL_DESC['nextcloud-data']='Nextcloud Data' -REPL_DESC['nextcloud-www']='Nextcloud WWW' declare -A BACKUP_ITEMS BACKUP_ITEMS[nginx-settings]=/etc/nginx