Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ LETSENCRYPT_STAGING=1
# Used to define storages in QFieldCloud. Note the contents of this variable is a superset of Django's `STORAGES` setting.
# NOTE: Note if the `STORAGES` is not available, QFieldCloud will still work with `STORAGE_ACCESS_KEY_ID`, `STORAGE_SECRET_KEY_ID`, `STORAGE_BUCKET_NAME` and `STORAGE_REGION_NAME` from previous QFC versions.
# NOTE: The custom property `QFC_IS_LEGACY` is temporary available to allow migration from the old to the new way of handling files. This option will soon be removed, so you are highly encouraged to migrate all the projects to the new way of handling files.
# NOTE: The `endpoint_url` must be a URL reachable from within docker and the host, the default value `172.17.0.1` for `minio` is the docker network `bridge`. On windows/mac, change the value to "http://host.docker.internal:8009".
# NOTE: The `endpoint_url` must be a URL reachable from within docker and the host, the default value `172.17.0.1` for `rustfs` is the docker network `bridge`. On windows/mac, change the value to "http://host.docker.internal:8009".
# DEFAULT:
# {
# "default": {
# "BACKEND": "qfieldcloud.filestorage.backend.QfcS3Boto3Storage",
# "OPTIONS": {
# "access_key": "minioadmin",
# "secret_key": "minioadmin",
# "access_key": "rustfsadmin",
# "secret_key": "rustfsadmin",
# "bucket_name": "qfieldcloud-local",
# "region_name": "",
# "endpoint_url": "http://172.17.0.1:8009"
Expand Down Expand Up @@ -130,8 +130,8 @@ STORAGES='{
"default": {
"BACKEND": "qfieldcloud.filestorage.backend.QfcS3Boto3Storage",
"OPTIONS": {
"access_key": "minioadmin",
"secret_key": "minioadmin",
"access_key": "rustfsadmin",
"secret_key": "rustfsadmin",
"bucket_name": "qfieldcloud-local",
"region_name": "",
"endpoint_url": "http://172.17.0.1:8009"
Expand Down Expand Up @@ -479,28 +479,28 @@ SMTP4DEV_IMAP_PORT=143
# DEFAULT: 17-3.5-alpine
POSTGIS_IMAGE_VERSION=17-3.5-alpine

# Local admin username configuration for minio storage in local and standalone instances.
# NOTE: Ignored if `minio` is not used.
# Local admin username configuration for object storage in local and standalone instances.
# NOTE: Ignored if `rustfs` is not used.
# NOTE: Needs to be the same as in the `STORAGES` setting in standalone config.
# DEFAULT: MINIO_ROOT_USER=minioadmin
MINIO_ROOT_USER=minioadmin
# DEFAULT: "rustfsadmin"
OBJECT_STORAGE_ROOT_USER="rustfsadmin"

# Local admin password configuration for minio storage in local and standalone instances.
# NOTE: Ignored if `minio` is not used.
# Local admin password configuration for object storage in local and standalone instances.
# NOTE: Ignored if `rustfs` is not used.
# NOTE: Needs to be the same as in the `STORAGES` setting in standalone config.
# DEFAULT: MINIO_ROOT_PASSWORD=minioadmin
MINIO_ROOT_PASSWORD=minioadmin
# DEFAULT: "rustfsadmin"
OBJECT_STORAGE_ROOT_PASSWORD="rustfsadmin"

# Public port to the minio API endpoint. It must match the configured port in `STORAGE_ENDPOINT_URL`.
# NOTE: Ignored if `minio` is not used.
# Public port to the object storage API endpoint. It must match the configured port in `STORAGE_ENDPOINT_URL`.
# NOTE: Ignored if `rustfs` is not used.
# NOTE: Needs to be the same as in the `STORAGES` setting in standalone config.
# DEFAULT: 8009
MINIO_API_PORT=8009
OBJECT_STORAGE_API_PORT=8009

# Public port to the minio browser endpoint.
# NOTE: Ignored if `minio` is not used.
# Public port to the object storage browser endpoint.
# NOTE: Ignored if `rustfs` is not used.
# DEFAULT: 8010
MINIO_BROWSER_PORT=8010
OBJECT_STORAGE_BROWSER_PORT=8010

# Public port to the webdav server.
# NOTE: Ignored if `webdav` docker service is not used.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:
"legacy_storage": {
"BACKEND": "qfieldcloud.filestorage.backend.QfcS3Boto3Storage",
"OPTIONS": {
"access_key": "minioadmin",
"secret_key": "minioadmin",
"access_key": "rustfsadmin",
"secret_key": "rustfsadmin",
"bucket_name": "qfieldcloud-local-legacy",
"region_name": "",
"endpoint_url": "http://172.17.0.1:8009"
Expand All @@ -91,8 +91,8 @@ jobs:
"default": {
"BACKEND": "qfieldcloud.filestorage.backend.QfcS3Boto3Storage",
"OPTIONS": {
"access_key": "minioadmin",
"secret_key": "minioadmin",
"access_key": "rustfsadmin",
"secret_key": "rustfsadmin",
"bucket_name": "qfieldcloud-local",
"region_name": "",
"endpoint_url": "http://172.17.0.1:8009"
Expand Down
Loading
Loading