Merge remote-tracking branch 'upstream/main' into feat/base-service-delivery

# Conflicts:
#	ansible/mysql-deploy.yml
#	frontend/src/api/delivery.ts
#	frontend/src/views/service/Catalog.vue
#	server/.env.example
#	server/internal/config/config.go
#	server/internal/handler/task_log.go
#	server/internal/service/delivery.go

server/internal/config/config.go

@@ -66,6 +66,8 @@ type Config struct {
 	AWXWebhookToken           string
 	AWXFactsTemplateID        uint64
 	AWXFactsTimeoutSeconds    int
+	RollbackTemplateID        uint64
+	DeliveryServiceToken      string
 	DeliverySchedulerEnabled  bool
 	DeliveryDispatchSeconds   int
 	DeliveryCallbackBaseURL   string
@@ -138,6 +140,8 @@ func Load() Config {
 		AWXWebhookToken:           env("AWX_WEBHOOK_TOKEN", ""),
 		AWXFactsTemplateID:        envUint64("AWX_FACTS_TEMPLATE_ID", 0),
 		AWXFactsTimeoutSeconds:    envInt("AWX_FACTS_TIMEOUT_SECONDS", 45),
+		RollbackTemplateID:        uint64(envInt("DELIVERY_ROLLBACK_TEMPLATE_ID", 0)),
+		DeliveryServiceToken:      env("DELIVERY_SERVICE_TOKEN", ""),
 		DeliverySchedulerEnabled:  envBool("DELIVERY_SCHEDULER_ENABLED", false),
 		DeliveryDispatchSeconds:   envInt("DELIVERY_DISPATCH_SECONDS", 5),
 		DeliveryCallbackBaseURL:   trimURL(env("DELIVERY_CALLBACK_BASE_URL", publicBaseURL)),