diff --git a/defaults.inc b/defaults.inc index 6a3f22b3..bf371e99 100755 --- a/defaults.inc +++ b/defaults.inc @@ -11,10 +11,10 @@ PDHOSTS=159.203.158.51,45.55.107.166 MMHOSTS=10.10.1.24 PRIMARYHOST=10.10.1.51 MYSQLMANAGER=10.10.10.50 -NODESERVICES=mariadb,mysql,nginx,gitea,powerdns-admin,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 +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 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 +WEBSERVICES_CHECK=nginx,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.0-fpm,php8.1-fpm,gitea,pdnsadmin,pdnsadmin.socket,keepalived LBSERVICES_CHECK=haproxy,keepalived NCSERVICES_CHECK=nginx,php8.1-fpm,glusterd,redis-server PDSERVICES_CHECK=pdns,mariadb @@ -61,7 +61,6 @@ 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 Load Balancer' NM_SERVICES['keepalived']='Keepalived Load Balancer' NM_SERVICES['maxscale']='MaxScale Load Balancer' @@ -76,6 +75,8 @@ 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['pdnsadmin']='PowerDNS-Admin' +NM_SERVICES['pdnsadmin.socket']='PowerDNS-Admin Socket' NM_SERVICES['proxysql']='ProxySQL Load Balancer' NM_SERVICES['radarr']='Radarr' NM_SERVICES['sonarr']='Sonarr' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 05c833b7..315de401 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -164,7 +164,7 @@ STATUS(){ var2=${NTYPE}_SERVICES_CHECK[@] for srvc in "${!var2}"; do NOGOCHK=true; - if [ ${srvc} = "gitea" ] || [ ${srvc} = "powerdns-admin" ]; then + if [ ${srvc} = "gitea" ] || [ ${srvc} = "pdnsadmin" ] || [ ${srvc} = "pdnsadmin.socket" ]; then if [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *10.10.1.120* ]]; then NOGOCHK=false; fi @@ -1163,7 +1163,7 @@ SET-PERMISSIONS(){ fi nid=`expr $nid + 1` done - elif [ "${1}" = "powerdns-admin" ]; then + elif [ "${1}" = "pdnsadmin" ]; then nid=1 for nip in "${WEB_HOSTS[@]}"; do if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then @@ -1515,7 +1515,7 @@ SERVICE(){ fi NOGOCHK=true; - if [ "${1}" == "gitea" ] || [ "${1}" == "powerdns-admin" ]; then + if [ "${1}" == "gitea" ] || [ "${1}" == "pdnsadmin" ] || [ "${1}" == "pdnsadmin.socket" ]; then if [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *10.10.1.120* ]]; then NOGOCHK=false; fi @@ -2000,10 +2000,10 @@ if [ ${action-x} ]; then status-check) STATUS-CHECK ${2};; set-permissions) SET-PERMISSIONS ${2};; service) - if [[ ( "$2" = "gitea" ) || ( "$2" = "powerdns-admin" ) ]] && [ "$3" = "start" ]; then + if [[ ( "$2" = "giteax" ) || ( "$2" = "powerdns-admin" ) ]] && [ "$3" = "start" ]; then #SET-PERMISSIONS ${2} SERVICE ${2} start - elif [[ ( "$2" = "gitea" ) || ( "$2" = "powerdns-admin" ) ]] && [ "$3" = "restart" ]; then + elif [[ ( "$2" = "giteax" ) || ( "$2" = "powerdns-admin" ) ]] && [ "$3" = "restart" ]; then SERVICE ${2} stop #SET-PERMISSIONS ${2} SERVICE ${2} start