Update rendered example
This commit is contained in:
parent
4b2ed17af9
commit
85dcdf515f
|
@ -136,7 +136,7 @@ _EOT
|
|||
# So, publish BookStack settings here
|
||||
template {
|
||||
data = <<_EOT
|
||||
APP_KEY={{ with secret "/kv/service/bookstack" }}{{ .Data.data.app_key }}{{ end }}
|
||||
APP_KEY={{ with secret "kv/service/bookstack" }}{{ .Data.data.app_key }}{{ end }}
|
||||
APP_LANG=fr
|
||||
APP_PROXIES=127.0.0.1
|
||||
APP_URL=https://bookstack.example.org
|
||||
|
@ -144,9 +144,9 @@ CACHE_DRIVER=database
|
|||
CACHE_PREFIX=bookstack
|
||||
DB_DATABASE=bookstack
|
||||
DB_HOST=127.0.0.1
|
||||
DB_PASSWORD={{ with secret "/database/creds/bookstack" }}{{ .Data.password }}{{ end }}
|
||||
DB_PASSWORD={{ with secret "database/creds/bookstack" }}{{ .Data.password }}{{ end }}
|
||||
DB_PORT=3306
|
||||
DB_USERNAME={{ with secret "/database/creds/bookstack" }}{{ .Data.username }}{{ end }}
|
||||
DB_USERNAME={{ with secret "database/creds/bookstack" }}{{ .Data.username }}{{ end }}
|
||||
DISABLE_EXTERNAL_SERVICES=true
|
||||
MAIL_DRIVER=smtp
|
||||
MAIL_FROM=no-reply@bookstack.example.org
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM danielberteaud/php:82.24.2-1
|
||||
FROM danielberteaud/php:82.24.3-1
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ARG BOOKSTACK_VERSION=24.02
|
||||
|
@ -13,7 +13,7 @@ ENV LANG=fr_FR.utf8 \
|
|||
SESSION_SECURE_COOKIE=true
|
||||
|
||||
USER root
|
||||
COPY --from=danielberteaud/wkhtmltopdf:24.2-1 /usr/local/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
|
||||
COPY --from=danielberteaud/wkhtmltopdf:24.3-1 /usr/local/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
|
||||
RUN set -euxo pipefail &&\
|
||||
apk add --no-cache \
|
||||
php${PHP_VERSION}-tokenizer \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
set -euo pipefail
|
||||
|
||||
|
||||
vault write /database/roles/bookstack \
|
||||
vault write database/roles/bookstack \
|
||||
db_name="mariadb" \
|
||||
creation_statements="CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}'; \
|
||||
GRANT ALL PRIVILEGES ON bookstack.* TO '{{name}}'@'%'; \
|
||||
|
|
|
@ -5,7 +5,7 @@ set -euo pipefail
|
|||
# vim: syntax=sh
|
||||
|
||||
export LC_ALL=C
|
||||
VAULT_KV_PATH=/kv/service/bookstack
|
||||
VAULT_KV_PATH=kv/service/bookstack
|
||||
RAND_CMD="echo base64:$(openssl rand -base64 32)"
|
||||
if ! vault kv list $(dirname ${VAULT_KV_PATH}) 2>/dev/null | grep -q -E "^$(basename ${VAULT_KV_PATH})\$"; then
|
||||
vault kv put ${VAULT_KV_PATH} \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
path "/database/creds/bookstack" {
|
||||
path "database/creds/bookstack" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
||||
path "/kv/data/service/bookstack" {
|
||||
path "kv/data/service/bookstack" {
|
||||
capabilities = ["read"]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue