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

# Conflicts:
#	server/.env.example
#	server/internal/config/config.go
#	server/internal/service/delivery.go
#	server/internal/service/delivery_test.go

server/.env.example

@@ -22,6 +22,10 @@ DELIVERY_CALLBACK_BASE_URL=http://authserver-backend.authserver.svc.cluster.loca
 DELIVERY_RESERVATION_TTL_MINUTES=120
 DELIVERY_GLOBAL_LIMIT=2
 DELIVERY_TARGET_LIMIT=2
+# 单机 MySQL 实例数上限（同机多实例，容量由配额 + playbook 实机守卫兜底）
+DELIVERY_HOST_INSTANCE_LIMIT=4
+# 数据盘挂载点白名单（逗号分隔，第一项为默认值）
+DELIVERY_DATA_DISKS=/data
 AWX_BASE_URL=
 AWX_TOKEN=
 AWX_USERNAME=