added last fixes for dev branch prepartion
This commit is contained in:
@@ -2241,8 +2241,18 @@ func requestCertificateHandler(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("[STATUS] %s", status)
|
||||
}
|
||||
|
||||
// Erstelle ACME-Client-Kontext
|
||||
// Standardmäßig verwenden wir Let's Encrypt Staging, aber in Zukunft könnte dies aus der FQDN-Konfiguration kommen
|
||||
acmeProviderIDStr := "letsencrypt-staging" // TODO: Aus FQDN-Konfiguration lesen
|
||||
acmeCtx, err := NewACMEClientContext(acmeProviderIDStr)
|
||||
if err != nil {
|
||||
log.Printf("FEHLER beim Erstellen des ACME-Client-Kontexts: %v", err)
|
||||
http.Error(w, fmt.Sprintf("Fehler beim Initialisieren des ACME-Providers: %v", err), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("Rufe RequestCertificate auf...")
|
||||
result, err := RequestCertificate(baseFqdn, fqdn.AcmeEmail, fqdnID, fqdn.AcmeKeyID, traceID, updateTokenFunc, cleanupTokenFunc, statusCallback)
|
||||
result, err := RequestCertificate(acmeCtx, baseFqdn, fqdn.AcmeEmail, fqdnID, fqdn.AcmeKeyID, traceID, updateTokenFunc, cleanupTokenFunc, statusCallback)
|
||||
if err != nil {
|
||||
logCertStatus(traceID, fqdnID, "ZERTIFIKATSANFRAGE_GESAMT", "FAILED", err.Error())
|
||||
stepStatus["ZERTIFIKATSANFRAGE_GESAMT"] = "error"
|
||||
@@ -5592,6 +5602,11 @@ func main() {
|
||||
pm.RegisterProvider(providers.NewAutoDNSProvider())
|
||||
pm.RegisterProvider(providers.NewHetznerProvider())
|
||||
pm.RegisterProvider(providers.NewCertigoACMEProxyProvider())
|
||||
|
||||
// Initialisiere ACME-Provider
|
||||
acmeManager := providers.GetACMEManager()
|
||||
acmeManager.RegisterACMEProvider(providers.NewLetsEncryptProvider("production"))
|
||||
acmeManager.RegisterACMEProvider(providers.NewLetsEncryptProvider("staging"))
|
||||
|
||||
// Starte Renewal Scheduler
|
||||
StartRenewalScheduler()
|
||||
@@ -5655,6 +5670,7 @@ func main() {
|
||||
|
||||
// Renewal Queue Routes
|
||||
api.HandleFunc("/renewal-queue", basicAuthMiddleware(getRenewalQueueHandler)).Methods("GET", "OPTIONS")
|
||||
api.HandleFunc("/renewal-queue", basicAuthMiddleware(deleteAllRenewalQueueEntriesHandler)).Methods("DELETE", "OPTIONS")
|
||||
|
||||
// Renewal Queue Test Routes (nur für Administratoren)
|
||||
api.HandleFunc("/renewal-queue/test/create", basicAuthMiddleware(createTestRenewalQueueEntryHandler)).Methods("POST", "OPTIONS")
|
||||
|
||||
Reference in New Issue
Block a user