diff --git a/CloudronManifest.json b/CloudronManifest.json index dc13380..678e38e 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -19,15 +19,11 @@ } }, "addons": { - "localstorage": {}, - "oidc": { - "loginRedirectUri": "/oauth_callback" - } + "localstorage": {} }, "optionalSso": true, "checklist": { "change-default-password": { - "sso": false, "message": "Change the default admin credentials by following this [guide](https://cloudron.io/documentation/apps/minio/#admin-credentials)" } }, diff --git a/POSTINSTALL.md b/POSTINSTALL.md index ba8be2f..7b386d4 100644 --- a/POSTINSTALL.md +++ b/POSTINSTALL.md @@ -1,18 +1,5 @@ - Please use the following credentials to login: **Username**: minioadmin
**Password**: minioadmin
-
- - - -Please use the following credentials to login via 'Other Authentication Methods' -> 'Use Credentials': - -**Username**: minioadmin
-**Password**: See `MINIO_ROOT_PASSWORD` in `/app/data/env.sh` Open File Manager
- -Cloudron users have `readwrite` access policy. See the [docs](https://cloudron.io/documentation/apps/minio/#admin-credentials) on how to change it. - - diff --git a/start.sh b/start.sh index 362e2e3..8f27979 100755 --- a/start.sh +++ b/start.sh @@ -8,13 +8,7 @@ mkdir -p /app/data/data /run/minio/config /run/minio/certs if [[ ! -f /app/data/env.sh ]]; then echo "=> First run" cp /app/code/env.sh.template /app/data/env.sh - # minio does not show the password login by default when OIDC is setup (https://github.com/minio/minio/discussions/16928) - # we generate a dynamic password because users might forget to change the admin password (with the oidc login being so click friendly) - if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then - echo -e "export MINIO_ROOT_USER=minioadmin\nexport MINIO_ROOT_PASSWORD=$(pwgen -1s 20)\n\n" >> /app/data/env.sh - else - echo -e "export MINIO_ROOT_USER=minioadmin\nexport MINIO_ROOT_PASSWORD=minioadmin\n\n" >> /app/data/env.sh - fi + echo -e "export MINIO_ROOT_USER=minioadmin\nexport MINIO_ROOT_PASSWORD=minioadmin\n\n" >> /app/data/env.sh fi source /app/data/env.sh @@ -28,19 +22,6 @@ if [[ ! -d /app/data/mc_config ]]; then /app/code/mc --config-dir /app/data/mc_config &> /dev/null || true fi -if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then - export MINIO_IDENTITY_OPENID_DISPLAY_NAME="${CLOUDRON_OIDC_PROVIDER_NAME:-Cloudron}" - export MINIO_IDENTITY_OPENID_CONFIG_URL="${CLOUDRON_OIDC_DISCOVERY_URL}" - export MINIO_IDENTITY_OPENID_CLIENT_ID="${CLOUDRON_OIDC_CLIENT_ID}" - export MINIO_IDENTITY_OPENID_CLIENT_SECRET="${CLOUDRON_OIDC_CLIENT_SECRET}" - export MINIO_IDENTITY_OPENID_SCOPES="openid profile email" - if [[ -z "${MINIO_IDENTITY_OPENID_ROLE_POLICY:-}" ]]; then - export MINIO_IDENTITY_OPENID_ROLE_POLICY="readwrite" - fi - - export MINIO_IDENTITY_OPENID_COMMENT="Cloudron OIDC" -fi - # minio is used for backups at times and has a large number of files. optimize by checking if files are actually in correct chown state echo "==> Changing ownership" [[ $(stat --format '%U' /app/data/data) != "cloudron" ]] && chown -R cloudron:cloudron /app/data