Four-Lights
/
devops
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

shuttles #2

Open
thomas wants to merge 27 commits from shuttles into main
pull from: shuttles
merge into: Four-Lights:main
Conversation 0 Commits 27 Files Changed 440 +7 -1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d85473223 - Show all commits

7
quadlets/modules/minio/main.tf
View File

@ -16,6 +16,11 @@ variable "server_domain" {
type = string type = string
} }
variable "https" {
type = bool
default = false
}
resource "random_password" "minio_access_key" { resource "random_password" "minio_access_key" {
length = 20 length = 20
special = false special = false
@ -45,7 +50,7 @@ module "minio" {
MINIO_ROOT_USER = random_password.minio_access_key.result MINIO_ROOT_USER = random_password.minio_access_key.result
MINIO_ROOT_PASSWORD = random_password.minio_secret_key.result MINIO_ROOT_PASSWORD = random_password.minio_secret_key.result
MINIO_CONSOLE_ADDRESS = ":9001" MINIO_CONSOLE_ADDRESS = ":9001"
MINIO_BROWSER_REDIRECT_URL = "http://storage.${var.server_domain}" MINIO_BROWSER_REDIRECT_URL = "${var.https ? "https" : "http" }://storage.${var.server_domain}"
} }
command = ["server", "/data", "--console-address", ":9001"] command = ["server", "/data", "--console-address", ":9001"]

1
quadlets/modules/minio/tenant/main.tf
View File

@ -185,6 +185,7 @@ resource "minio_iam_user_policy_attachment" "overlay" {
resource "minio_iam_service_account" "overlay" { resource "minio_iam_service_account" "overlay" {
depends_on = [minio_iam_user.overlay, minio_s3_bucket.overlay, minio_s3_bucket.uploads] depends_on = [minio_iam_user.overlay, minio_s3_bucket.overlay, minio_s3_bucket.uploads]
target_user = minio_iam_user.overlay.name target_user = minio_iam_user.overlay.name
name = var.name
policy = jsonencode({ policy = jsonencode({
Version = "2012-10-17" Version = "2012-10-17"
Statement = [ Statement = [