Erreur32/nginx-proxy-manager-Bash-API
1
1
Fork 0
mirror of https://github.com/Erreur32/nginx-proxy-manager-Bash-API.git synced 2025-04-14 20:11:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix --host-create long command

Browse source
This commit is contained in:
Erreur32 2025-03-24 15:52:16 +01:00
parent d058de2c76
commit 92bd749a09
1 changed files with 22 additions and 11 deletions

33
npm-api.sh
View file

@ -2507,10 +2507,9 @@ cert_generate() {
echo -e "\n ⛔ ${COLOR_RED}ERROR: Certificate not found after generation${CoR}" echo -e "\n ⛔ ${COLOR_RED}ERROR: Certificate not found after generation${CoR}"
exit 1 exit 1
fi fi
host_ssl_enable
fi fi
return 0 #return 0
else else
echo -e "\n ❌ ${COLOR_RED}Certificate generation failed!${CoR}" echo -e "\n ❌ ${COLOR_RED}Certificate generation failed!${CoR}"
ERROR_MSG=$(echo "$HTTP_BODY" | jq -r '.error.message // "Unknown error"') ERROR_MSG=$(echo "$HTTP_BODY" | jq -r '.error.message // "Unknown error"')
@ -2613,6 +2612,7 @@ host_ssl_enable() {
if [ "$HTTP_STATUS" -eq 200 ]; then if [ "$HTTP_STATUS" -eq 200 ]; then
echo -e "\n ✅ ${COLOR_GREEN}SSL enabled successfully for${CoR} ${COLOR_YELLOW}$HOST_DOMAIN${CoR} (ID: ${COLOR_CYAN}$HOST_ID${CoR}) (Cert ID: ${COLOR_CYAN}$CERT_ID${CoR})\n" echo -e "\n ✅ ${COLOR_GREEN}SSL enabled successfully for${CoR} ${COLOR_YELLOW}$HOST_DOMAIN${CoR} (ID: ${COLOR_CYAN}$HOST_ID${CoR}) (Cert ID: ${COLOR_CYAN}$CERT_ID${CoR})\n"
return 0 return 0
#exit 0
else else
echo -e "\n ⛔ ${COLOR_RED}Failed to enable SSL. HTTP status: $HTTP_STATUS${CoR}\n" echo -e "\n ⛔ ${COLOR_RED}Failed to enable SSL. HTTP status: $HTTP_STATUS${CoR}\n"
echo -e " 📋 Error details: $HTTP_BODY \n" echo -e " 📋 Error details: $HTTP_BODY \n"
@ -3788,16 +3788,19 @@ while [[ "$#" -gt 0 ]]; do
--cert-generate) --cert-generate)
CERT_GENERATE=true CERT_GENERATE=true
shift shift
if [ -n "$1" ] && [[ "$1" != --* ]]; then if [ $# -gt 0 ] && [[ "$1" != --* ]]; then
CERT_DOMAIN="$1" CERT_DOMAIN="$1"
shift shift
else
# Si pas d'argument spécifique pour --cert-generate, utiliser le domaine du host
CERT_DOMAIN="$DOMAIN_NAMES"
fi fi
;; ;;
--cert-email) shift; CERT_EMAIL="$1"; shift ;; --cert-email) shift; CERT_EMAIL="$1"; shift ;;
--dns-provider) shift; CERT_DNS_PROVIDER="$1"; shift ;; --dns-provider) shift; CERT_DNS_PROVIDER="$1"; shift ;;
--dns-credentials) shift; CERT_DNS_CREDENTIALS="$1"; shift ;; --dns-credentials) shift; CERT_DNS_CREDENTIALS="$1"; shift ;;
--host-ssl-enable) HOST_SSL_ENABLE=true ;; --host-ssl-enable) HOST_SSL_ENABLE=true; shift ;;
-y) AUTO_YES=true ;; -y) AUTO_YES=true; shift ;;
esac esac
;; ;;
*) *)
@ -4116,21 +4119,29 @@ elif [ "$HOST_CREATE" = true ]; then
if [ "$CERT_GENERATE" = true ]; then if [ "$CERT_GENERATE" = true ]; then
cert_generate "$DOMAIN_NAMES" "$CERT_EMAIL" "$CERT_DNS_PROVIDER" "$CERT_DNS_CREDENTIALS" cert_generate "$DOMAIN_NAMES" "$CERT_EMAIL" "$CERT_DNS_PROVIDER" "$CERT_DNS_CREDENTIALS"
if [ "$HOST_SSL_ENABLE" = true ]; then if [ "$HOST_SSL_ENABLE" = true ]; then
host_ssl_enable "$HOST_ID" echo "DEBUG: HOST_ID=$HOST_ID"
echo "DEBUG: GENERATED_CERT_ID=$GENERATED_CERT_ID"
host_ssl_enable "$HOST_ID" "$GENERATED_CERT_ID"
fi fi
fi fi
exit 0 exit 0
# Actions SSL # Actions SSL
elif [ "$CERT_GENERATE" = true ]; then elif [ "$CERT_GENERATE" = true ] && [ "$HOST_CREATE" != true ]; then # ✅ Ajout de la condition
cert_generate "$CERT_DOMAIN" "$CERT_EMAIL" "$CERT_DNS_PROVIDER" "$CERT_DNS_CREDENTIALS" cert_generate "$CERT_DOMAIN" "$CERT_EMAIL" "$CERT_DNS_PROVIDER" "$CERT_DNS_CREDENTIALS"
# If --host-ssl-enable
if [ "$HOST_SSL_ENABLE" = true ]; then if [ "$HOST_SSL_ENABLE" = true ]; then
host_ssl_enable "$HOST_ID" host_ssl_enable "$HOST_ID"
exit 0 exit 0
fi fi
#elif [ "$CERT_GENERATE" = true ]; then
# cert_generate "$CERT_DOMAIN" "$CERT_EMAIL" "$CERT_DNS_PROVIDER" "$CERT_DNS_CREDENTIALS"
# If --host-ssl-enable
# if [ "$HOST_SSL_ENABLE" = true ]; then
# host_ssl_enable "$HOST_ID"
# exit 0
# fi
elif [ "$HOST_DELETE" = true ]; then elif [ "$HOST_DELETE" = true ]; then
host_delete "$HOST_ID" host_delete "$HOST_ID"