@@ -2507,10 +2507,9 @@ cert_generate() {
2507
2507
echo -e " \n ⛔ ${COLOR_RED} ERROR: Certificate not found after generation${CoR} "
2508
2508
exit 1
2509
2509
fi
2510
-
2511
- host_ssl_enable
2510
+
2512
2511
fi
2513
- return 0
2512
+ # return 0
2514
2513
else
2515
2514
echo -e " \n ❌ ${COLOR_RED} Certificate generation failed!${CoR} "
2516
2515
ERROR_MSG=$( echo " $HTTP_BODY " | jq -r ' .error.message // "Unknown error"' )
@@ -2613,6 +2612,7 @@ host_ssl_enable() {
2613
2612
if [ " $HTTP_STATUS " -eq 200 ]; then
2614
2613
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"
2615
2614
return 0
2615
+ # exit 0
2616
2616
else
2617
2617
echo -e " \n ⛔ ${COLOR_RED} Failed to enable SSL. HTTP status: $HTTP_STATUS ${CoR} \n"
2618
2618
echo -e " 📋 Error details: $HTTP_BODY \n"
@@ -3788,16 +3788,19 @@ while [[ "$#" -gt 0 ]]; do
3788
3788
--cert-generate)
3789
3789
CERT_GENERATE=true
3790
3790
shift
3791
- if [ -n " $1 " ] && [[ " $1 " != --* ]]; then
3791
+ if [ $# -gt 0 ] && [[ " $1 " != --* ]]; then
3792
3792
CERT_DOMAIN=" $1 "
3793
3793
shift
3794
+ else
3795
+ # Si pas d'argument spécifique pour --cert-generate, utiliser le domaine du host
3796
+ CERT_DOMAIN=" $DOMAIN_NAMES "
3794
3797
fi
3795
3798
;;
3796
3799
--cert-email) shift ; CERT_EMAIL=" $1 " ; shift ;;
3797
3800
--dns-provider) shift ; CERT_DNS_PROVIDER=" $1 " ; shift ;;
3798
3801
--dns-credentials) shift ; CERT_DNS_CREDENTIALS=" $1 " ; shift ;;
3799
- --host-ssl-enable) HOST_SSL_ENABLE=true ;;
3800
- -y) AUTO_YES=true ;;
3802
+ --host-ssl-enable) HOST_SSL_ENABLE=true; shift ;;
3803
+ -y) AUTO_YES=true; shift ;;
3801
3804
esac
3802
3805
;;
3803
3806
* )
@@ -4116,21 +4119,29 @@ elif [ "$HOST_CREATE" = true ]; then
4116
4119
if [ " $CERT_GENERATE " = true ]; then
4117
4120
cert_generate " $DOMAIN_NAMES " " $CERT_EMAIL " " $CERT_DNS_PROVIDER " " $CERT_DNS_CREDENTIALS "
4118
4121
if [ " $HOST_SSL_ENABLE " = true ]; then
4119
- host_ssl_enable " $HOST_ID "
4122
+ echo " DEBUG: HOST_ID=$HOST_ID "
4123
+ echo " DEBUG: GENERATED_CERT_ID=$GENERATED_CERT_ID "
4124
+ host_ssl_enable " $HOST_ID " " $GENERATED_CERT_ID "
4120
4125
fi
4121
4126
fi
4122
- exit 0
4123
-
4127
+ exit 0
4124
4128
4125
4129
# Actions SSL
4126
- elif [ " $CERT_GENERATE " = true ]; then
4130
+ elif [ " $CERT_GENERATE " = true ] && [ " $HOST_CREATE " != true ] ; then # ✅ Ajout de la condition
4127
4131
cert_generate " $CERT_DOMAIN " " $CERT_EMAIL " " $CERT_DNS_PROVIDER " " $CERT_DNS_CREDENTIALS "
4128
- # If --host-ssl-enable
4129
4132
if [ " $HOST_SSL_ENABLE " = true ]; then
4130
4133
host_ssl_enable " $HOST_ID "
4131
4134
exit 0
4132
4135
fi
4133
4136
4137
+ # elif [ "$CERT_GENERATE" = true ]; then
4138
+ # cert_generate "$CERT_DOMAIN" "$CERT_EMAIL" "$CERT_DNS_PROVIDER" "$CERT_DNS_CREDENTIALS"
4139
+ # If --host-ssl-enable
4140
+ # if [ "$HOST_SSL_ENABLE" = true ]; then
4141
+ # host_ssl_enable "$HOST_ID"
4142
+ # exit 0
4143
+ # fi
4144
+
4134
4145
4135
4146
elif [ " $HOST_DELETE " = true ]; then
4136
4147
host_delete " $HOST_ID "
0 commit comments