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

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-03 21:06:09 -06:00
parent c3f87211f1
commit ea04fc996a
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
defaults.inc
View File

@@ -1,7 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.16.30-12032023' VERS='4.16.31-12032023'
NM_BETA=true
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'
declare -i errtime declare -i errtime

6
nodemgmt-scripts.sh
View File

@@ -774,6 +774,11 @@ SETUPSSH(){
done done
} }
BETACHECK(){
source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/NodeMgmt/raw/branch/master/defaults.inc)"
[ "${NM_BETA}" == "true" ] && echo true || echo false
}
GUI(){ GUI(){
DISP_HEADER true false DISP_HEADER true false
@@ -860,6 +865,7 @@ GUI(){
fi fi
;; ;;
setupssh) SETUPSSH ${2} ${3} ${4} ${5} ${6};; setupssh) SETUPSSH ${2} ${3} ${4} ${5} ${6};;
betacheck) BETACHECK;;
update-dyndns) UPDATE_DYNDNS ${2} ${3} ${4} ${5} ${6};; update-dyndns) UPDATE_DYNDNS ${2} ${3} ${4} ${5} ${6};;
backup) BACKUP;; backup) BACKUP;;
downlist) downlist)

1
run.sh
View File

@@ -33,6 +33,7 @@ if [ "${1}" == "update" ]; then
cd ${NM_FOLDER} cd ${NM_FOLDER}
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
# if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then # if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then
if [ "${2}" != "q" ]; then if [ "${2}" != "q" ]; then
echo -en "\e[1A"; echo -en "\e[1A";
echo -e "\e[0K\r ${idsCL[LightCyan]}Updating NodeMgmt...${idsCL[Default]}" echo -e "\e[0K\r ${idsCL[LightCyan]}Updating NodeMgmt...${idsCL[Default]}"