voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-05-23 18:40:56 -05:00
parent e49578d167
commit fa60f249de
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.6.61-05222023' VERS='4.6.62-05232023'
# NODETYPES=PW # NODETYPES=PW
# NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW,WM # NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW,WM
@@ -21,6 +21,7 @@ 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" 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},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" NODESERVICES="${NODESERVICES},redis-server,mosquitto,tailscaled,cmon,monitor-power,monitor-temp"
MYSQLSERVICES_CHECK=mariadb,proxysql,keepalived 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 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 LBSERVICES_CHECK=nginx,haproxy,keepalived
@@ -31,7 +32,7 @@ MMSERVICES_CHECK=radarr,sonarr,jackett,qbittorrent,snap.tautulli.tautulli,ombi,n
PWSERVICES_CHECK=mosquitto,monitor-power,monitor-temp PWSERVICES_CHECK=mosquitto,monitor-power,monitor-temp
WMSERVICES_CHECK=nginx,tailscaled WMSERVICES_CHECK=nginx,tailscaled
WEBDOCKER=phpmyadmin,phppgadmin,vaultwarden WEBDOCKER=phpmyadmin,phppgadmin,vaultwarden,heimdall
WMDOCKER=uptime-kuma WMDOCKER=uptime-kuma
PWDOCKER=uptime-kuma PWDOCKER=uptime-kuma
#LBDOCKER=nginx-proxy_manager #LBDOCKER=nginx-proxy_manager
@@ -168,12 +169,15 @@ declare -A NM_DOCKERS
NM_DOCKERS['phpmyadmin']='phpMyAdmin' NM_DOCKERS['phpmyadmin']='phpMyAdmin'
NM_DOCKERS['phppgadmin']='phpPgAdmin' NM_DOCKERS['phppgadmin']='phpPgAdmin'
NM_DOCKERS['vaultwarden']='VaultWarden' NM_DOCKERS['vaultwarden']='VaultWarden'
NM_DOCKERS['heimdall']='Heimdall'
NM_DOCKERS['uptime-kuma']='Uptime-Kuma' NM_DOCKERS['uptime-kuma']='Uptime-Kuma'
NM_DOCKERS['nginx-proxy_manager']='Nginx Proxy Manager' NM_DOCKERS['nginx-proxy_manager']='Nginx Proxy Manager'
declare -A NM_DOCKER_COMPOSE declare -A NM_DOCKER_COMPOSE
NM_DOCKER_COMPOSE['phpmyadmin']='/mnt/web-Data/phpmyadmin' NM_DOCKER_COMPOSE['phpmyadmin']='/mnt/web-Data/phpmyadmin'
NM_DOCKER_COMPOSE['phppgadmin']='/mnt/web-Data/phppgadmin' NM_DOCKER_COMPOSE['phppgadmin']='/mnt/web-Data/phppgadmin'
NM_DOCKER_COMPOSE['vaultwarden']='/mnt/web-Data/vaultwarden'
NM_DOCKER_COMPOSE['heimdall']='/mnt/web-Data/heimdall'
NM_DOCKER_COMPOSE['uptime-kuma']='/opt/uptime-kuma' NM_DOCKER_COMPOSE['uptime-kuma']='/opt/uptime-kuma'
NM_DOCKER_COMPOSE['nginx-proxy_manager']='/opt/nginx-proxy' NM_DOCKER_COMPOSE['nginx-proxy_manager']='/opt/nginx-proxy'

2
inc/status.inc
View File

@@ -327,7 +327,7 @@ STATUS(){
fi fi
for docker in "${!dockers}"; do for docker in "${!dockers}"; do
[ "${docker}" == "vaultwarden" ] && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *${WEB_HOSTS[0]}* ]] && NOGOCHK=false || NOGOCHK=true ([ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ]) && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *${WEB_HOSTS[0]}* ]] && NOGOCHK=false || NOGOCHK=true
if [ ${NOGOCHK} == true ]; then if [ ${NOGOCHK} == true ]; then
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
if [ "${ST_ACTION}" != "report" ]; then if [ "${ST_ACTION}" != "report" ]; then

6
nodemgmt-scripts.sh
View File

@@ -758,10 +758,10 @@ SINGLE_SERVER_SERVICE_CHECK(){
done done
for nip in "${WEB_HOSTS[@]}"; do for nip in "${WEB_HOSTS[@]}"; do
if [[ "${local_ip}" != *"${nip}"* ]]; then if [[ "${local_ip}" != *"${nip}"* ]]; then
ssh root@${nip} /usr/bin/docker stop vaultwarden >/dev/null 2>&1 ssh root@${nip} /usr/bin/docker stop vaultwarden heimdall >/dev/null 2>&1
fi fi
done done
/usr/bin/docker start vaultwarden & >/dev/null 2>&1 /usr/bin/docker start vaultwarden heimdall & >/dev/null 2>&1
fi fi
else else
@@ -769,7 +769,7 @@ SINGLE_SERVER_SERVICE_CHECK(){
[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service" [ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service"
/bin/systemctl stop ${stc} & /bin/systemctl stop ${stc} &
done done
/usr/bin/docker stop vaultwarden & >/dev/null 2>&1 /usr/bin/docker stop vaultwarden heimdall & >/dev/null 2>&1
fi fi
if [ "$(systemctl is-active nginx)" != "active" ]; then if [ "$(systemctl is-active nginx)" != "active" ]; then