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
This commit is contained in:
mac
2026-07-28 15:08:37 +08:00
15 changed files with 1145 additions and 345 deletions
+3
View File
@@ -33,6 +33,9 @@ AWX_PASSWORD=
AWX_WEBHOOK_TOKEN=
AWX_FACTS_TEMPLATE_ID=
AWX_FACTS_TIMEOUT_SECONDS=45
# AWX Job Template ID for ansible/mysql-rollback.yml; required for automatic cleanup
DELIVERY_ROLLBACK_TEMPLATE_ID=0
DELIVERY_SERVICE_TOKEN=
CLOUDDM_REGISTER_URL=
CLOUDDM_API_TOKEN=