Skip to content

Fix Garage S3 follow-up review feedback #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
henmohr wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −8
Draft

Fix Garage S3 follow-up review feedback #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .docker/garages3.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php

$bucket = getenv('GARAGES3_BUCKET') ?: 'nextcloud';
$key = getenv('GARAGES3_KEY');
$key = getenv('GARAGES3_KEY_ID');
$key = ($key === false || $key === '') ? getenv('GARAGES3_KEY') : $key;
$secret = getenv('GARAGES3_SECRET');

if ($key === false || $key === '' || $secret === false || $secret === '') {
throw new RuntimeException('GARAGES3_KEY and GARAGES3_SECRET must be set for Garage S3 primary storage.');
throw new RuntimeException('GARAGES3_KEY_ID (or legacy GARAGES3_KEY) and GARAGES3_SECRET must be set for Garage S3 primary storage.');
}

$CONFIG = [
Expand Down
3 changes: 3 additions & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ POSTGRES_PASSWORD=
NEXTCLOUD_ADMIN_USER=
NEXTCLOUD_ADMIN_PASSWORD=

# Space-separated trusted domains, for example: "web yourdomain.tld"
NEXTCLOUD_TRUSTED_DOMAINS=

# Garage S3 primary storage (used by docker-compose-garages3.yml)
# GARAGES3_KEY is the Garage key name created by scripts/bootstrap-garages3.sh.
# GARAGES3_KEY_ID is the access key ID consumed by Nextcloud.
GARAGES3_BUCKET=nextcloud
GARAGES3_KEY=
GARAGES3_KEY_ID=
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cp .env.example .env
| [`VIRTUAL_HOST`](https://github.com/nginx-proxy/nginx-proxy#usage) | `web` | Your domain |
| [`LETSENCRYPT_HOST`](https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion/blob/master/docs/Basic-usage.md#step-3---proxyed-containers) | `web` | Your domain |
| [`LETSENCRYPT_EMAIL`](https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion/blob/master/docs/Let's-Encrypt-and-ACME.md#contact-address) | `web` | Your sysadmin email |
| `NEXTCLOUD_TRUSTED_DOMAINS` | `app` | domains separated by comma. The domain web is mandatory, add your domain together with whe domain web. The domain `web` is the domain of Nginx service. |
| `NEXTCLOUD_TRUSTED_DOMAINS` | `app` | space-separated domains. Include the `web` service name and your public domain, for example `web yourdomain.tld`. |
| `POSTGRES_DB` | `db` | PostgreSQL database name (default: nextcloud) |
| `POSTGRES_USER` | `db` | PostgreSQL database user (default: nextcloud) |
| `POSTGRES_PASSWORD` | `db` | PostgreSQL database user password |
Expand Down Expand Up @@ -113,8 +113,8 @@ Use `docker-compose-garages3.yml` when you want Nextcloud to store files in a Ga
The stack expects these values in `.env`:

- `GARAGES3_BUCKET`
- `GARAGES3_KEY`
- `GARAGES3_KEY_ID`
- `GARAGES3_KEY`, the Garage key name created by the bootstrap helper
- `GARAGES3_KEY_ID`, the Garage access key ID used by Nextcloud
- `GARAGES3_SECRET`
- `GARAGES3_HOSTNAME`, defaulting to `host.docker.internal`
- `GARAGES3_PORT`, defaulting to `3900`
Expand Down
6 changes: 3 additions & 3 deletions docs/README_ptBR.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ cp .env.example .env
| [`VIRTUAL_HOST`](https://github.com/nginx-proxy/nginx-proxy#usage) | `web` | Seu domínio |
| [`LETSENCRYPT_HOST`](https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion/blob/master/docs/Basic-usage.md#step-3---proxyed-containers) | `web` | Seu domínio |
| [`LETSENCRYPT_EMAIL`](https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion/blob/master/docs/Let's-Encrypt-and-ACME.md#contact-address) | `web` | Seu email de administrador de sistema |
| `NEXTCLOUD_TRUSTED_DOMAINS` | `app` | domínios separados por vírgula. O domínio `web` é obrigatório, adicione seu domínio junto com o domínio `web`. O domínio `web` é o domínio do serviço Nginx. |
| `NEXTCLOUD_TRUSTED_DOMAINS` | `app` | domínios separados por espaço. Inclua o nome do serviço `web` e seu domínio público, por exemplo `web seudominio.tld`. |

> **PS**: A Let's Encrypt só funciona em servidores quando os `VIRTUAL_HOST` e `LETSENCRYPT_HOST` têm um domínio público válido registrado em um servidor DNS. Não tente usá-lo em localhost, não funciona!

Expand Down Expand Up @@ -85,8 +85,8 @@ Use `docker-compose-garages3.yml` quando quiser que o Nextcloud grave os arquivo
O stack espera estes valores em `.env`:

- `GARAGES3_BUCKET`
- `GARAGES3_KEY`
- `GARAGES3_KEY_ID`
- `GARAGES3_KEY`, o nome da chave do Garage criado pelo helper de bootstrap
- `GARAGES3_KEY_ID`, o access key ID do Garage usado pelo Nextcloud
- `GARAGES3_SECRET`
- `GARAGES3_HOSTNAME`, com padrão `host.docker.internal`
- `GARAGES3_PORT`, com padrão `3900`
Expand Down
Loading