move s3 config to manifest

This commit is contained in:
red 2025-03-07 12:29:16 -05:00
parent ea4bd5e94d
commit e47a77a32e
2 changed files with 16 additions and 6 deletions

View file

@ -95,6 +95,10 @@ spec:
secretKeyRef: secretKeyRef:
name: pleroma name: pleroma
key: default-signer key: default-signer
- name: MEDIA_URL
value: "https://media.darkdork.dev"
- name: S3_BUCKET
value: pleroma.darkdork.dev
- name: S3_ACCESS_KEY - name: S3_ACCESS_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
@ -105,6 +109,12 @@ spec:
secretKeyRef: secretKeyRef:
name: pleroma name: pleroma
key: minio-secret-key key: minio-secret-key
- name: S3_SCHEME
value: "http://"
- name: S3_HOST
value: minio
- name: S3_PORT
value: "80"
- name: DB_HOST - name: DB_HOST
value: postgres value: postgres
- name: DB_NAME - name: DB_NAME

View file

@ -54,21 +54,21 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
# #
config :pleroma, Pleroma.Upload, config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.S3, uploader: Pleroma.Uploaders.S3,
base_url: "https://media.darkdork.dev" base_url: System.get_env("MEDIA_URL")
config :pleroma, Pleroma.Uploaders.S3, config :pleroma, Pleroma.Uploaders.S3,
bucket: "pleroma.darkdork.dev", bucket: System.get_env("S3_BUCKET"),
bucket_namespace: nil, bucket_namespace: nil,
truncated_namespace: "", truncated_namespace: "",
streaming_enabled: false streaming_enabled: true
# Configure S3 credentials: # Configure S3 credentials:
config :ex_aws, :s3, config :ex_aws, :s3,
access_key_id: System.get_env("S3_ACCESS_KEY"), access_key_id: System.get_env("S3_ACCESS_KEY"),
secret_access_key: System.get_env("S3_SECRET_KEY"), secret_access_key: System.get_env("S3_SECRET_KEY"),
scheme: "http://", scheme: System.get_env("S3_SCHEME"),
host: "minio", host: System.get_env("S3_HOST"),
port: 80 port: System.get_env("S3_PORT")
config :joken, default_signer: System.get_env("DEFAULT_SIGNER") config :joken, default_signer: System.get_env("DEFAULT_SIGNER")