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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-10 11:16:05 -06:00
parent 4af88732e9
commit c46853629f
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.12.108-11102023' VERS='4.12.111-11102023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

18
inc/certs.inc
View File

@@ -1,24 +1,23 @@
#!/usr/bin/env bash #!/usr/bin/env bash
NEWCERT(){ NEWCERT(){
CERTTEST=0 CERTTEST=0
if [ -z ${1+x} ]; then
echo -e -n "${idsCL[LightCyan]}Create certificate for what name (comma seperated for mutiple) : ${idsCL[Default]}"
read NEW_CERT
echo
else
NEW_CERT=${1}
fi
if [ ${3} -eq 0 ] || [ ${3} -eq 1 ]; then if [ ${3} -eq 0 ] || [ ${3} -eq 1 ]; then
NEW_CERT=${1}
CERTTEST=${3} CERTTEST=${3}
else else
CERTTEST=0
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "${1}" in
-test) CERTTEST=1;; -test) CERTTEST=1;;
*) NEW_CERT=${1};;
esac esac
shift shift
done done
fi fi
if [ "${NEW_CERT}" == "" ]; then
echo -en "\n${idsCL[LightCyan]}Create certificate for what name (comma seperated for mutiple) : ${idsCL[Default]}"
read NEW_CERT
echo
fi
echo echo
if [[ ${NEW_CERT} == *","* ]]; then if [[ ${NEW_CERT} == *","* ]]; then
@@ -42,7 +41,6 @@ NEWCERT(){
else else
$CERT_DAEMON certonly --webroot --preferred-chain "ISRG Root X1" -w ${NM_CERTPATH}/letsencrypt-acme-challenge -d ${NEW_CERT} $CERT_DAEMON certonly --webroot --preferred-chain "ISRG Root X1" -w ${NM_CERTPATH}/letsencrypt-acme-challenge -d ${NEW_CERT}
fi fi
# $CERT_DAEMON certonly --dry-run --webroot -w ${NM_CERTPATH}/letsencrypt-acme-challenge -d ${NEW_CERT}
chown -R root:le ${NM_CERTPATH} chown -R root:le ${NM_CERTPATH}
chmod -R 6775 ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH}