- Added windows llama proxy
- Added terraform-mcp - Added S3 storage to gitea - Changed context size for windows LLMs - Changed number of cores for VMs, added P2000 support
This commit is contained in:
@@ -165,3 +165,50 @@ resource "scaleway_object_bucket_policy" "sftpgo" {
|
||||
})
|
||||
}
|
||||
|
||||
resource "scaleway_object_bucket" "gitea" {
|
||||
name = "a13labs-gitea-packages-${random_string.bucket_suffix.result}"
|
||||
project_id = var.scaleway_project_id
|
||||
region = "fr-par"
|
||||
}
|
||||
|
||||
resource "scaleway_object_bucket_policy" "gitea" {
|
||||
bucket = scaleway_object_bucket.gitea.name
|
||||
policy = jsonencode({
|
||||
Version = "2023-04-17",
|
||||
Id = "AllowAccess",
|
||||
Statement = [
|
||||
{
|
||||
Effect = "Allow"
|
||||
Action = [
|
||||
"s3:*",
|
||||
]
|
||||
Principal = {
|
||||
SCW = "user_id:${var.scaleway_user_id}"
|
||||
}
|
||||
Resource = [
|
||||
scaleway_object_bucket.gitea.name,
|
||||
"${scaleway_object_bucket.gitea.name}/*",
|
||||
]
|
||||
},
|
||||
{
|
||||
Effect = "Allow"
|
||||
Action = [
|
||||
"s3:*",
|
||||
]
|
||||
Principal = {
|
||||
SCW = "application_id:${scaleway_iam_application.gitea_app.id}"
|
||||
}
|
||||
Resource = [
|
||||
scaleway_object_bucket.gitea.name,
|
||||
"${scaleway_object_bucket.gitea.name}/*",
|
||||
],
|
||||
Condition = {
|
||||
IpAddress = {
|
||||
"aws:SourceIp" = local.instance_ips
|
||||
}
|
||||
},
|
||||
},
|
||||
]
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,27 @@ resource "scaleway_iam_policy" "object_read_write_sftpgo" {
|
||||
}
|
||||
}
|
||||
|
||||
resource "scaleway_iam_application" "gitea_app" {
|
||||
name = "gitea_app"
|
||||
}
|
||||
|
||||
resource "scaleway_iam_policy" "object_read_write_gitea" {
|
||||
name = "Gitea app policy"
|
||||
description = "Gives gitea job access to object storage in project"
|
||||
application_id = scaleway_iam_application.gitea_app.id
|
||||
|
||||
rule {
|
||||
project_ids = [data.scaleway_account_project.default.id]
|
||||
permission_set_names = [
|
||||
"ObjectStorageObjectsWrite",
|
||||
"ObjectStorageObjectsRead",
|
||||
"ObjectStorageBucketsRead",
|
||||
"ObjectStorageBucketsWrite",
|
||||
"ObjectStorageObjectsDelete"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
resource "scaleway_iam_api_key" "backup_app_api" {
|
||||
application_id = scaleway_iam_application.backup_app.id
|
||||
description = "k8s backup app API key"
|
||||
@@ -70,3 +91,8 @@ resource "scaleway_iam_api_key" "sftpgo_app_api" {
|
||||
application_id = scaleway_iam_application.sftpgo_app.id
|
||||
description = "sftpgo access API key"
|
||||
}
|
||||
|
||||
resource "scaleway_iam_api_key" "gitea_app_api" {
|
||||
application_id = scaleway_iam_application.gitea_app.id
|
||||
description = "gitea access API key"
|
||||
}
|
||||
|
||||
@@ -32,3 +32,20 @@ output "sftpgo_app_api_secret_key" {
|
||||
value = scaleway_iam_api_key.sftpgo_app_api.secret_key
|
||||
sensitive = true
|
||||
}
|
||||
|
||||
output "gitea_app_api_access_key" {
|
||||
description = "The access key for the Gitea app API."
|
||||
value = scaleway_iam_api_key.gitea_app_api.access_key
|
||||
sensitive = true
|
||||
}
|
||||
|
||||
output "gitea_app_api_secret_key" {
|
||||
description = "The secret key for the Gitea app API."
|
||||
value = scaleway_iam_api_key.gitea_app_api.secret_key
|
||||
sensitive = true
|
||||
}
|
||||
|
||||
output "gitea_bucket_name" {
|
||||
description = "The name of the Gitea bucket."
|
||||
value = scaleway_object_bucket.gitea.name
|
||||
}
|
||||
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../sectool.json
|
||||
Reference in New Issue
Block a user