diff --git a/blueprints/wallabag/docker-compose.yml b/blueprints/wallabag/docker-compose.yml index 890758cf..e4359cf4 100644 --- a/blueprints/wallabag/docker-compose.yml +++ b/blueprints/wallabag/docker-compose.yml @@ -25,6 +25,8 @@ services: - SYMFONY__ENV__FROM_EMAIL=${SYMFONY__ENV__FROM_EMAIL} - SYMFONY__ENV__DOMAIN_NAME=${SYMFONY__ENV__DOMAIN_NAME} - SYMFONY__ENV__SERVER_NAME=${SYMFONY__ENV__SERVER_NAME} + - SYMFONY__ENV__SECRET=${SYMFONY__ENV__SECRET} + - SYMFONY__ENV__REDIS_HOST=wallabag-redis volumes: - wallabag-images:/var/www/wallabag/web/assets/images @@ -32,10 +34,11 @@ services: image: mariadb:11.4 restart: unless-stopped environment: + # Only the root password is set on purpose: the wallabag entrypoint + # creates the database and user and runs `wallabag:install` itself. + # Pre-creating the database (MARIADB_DATABASE) makes the entrypoint + # skip the install, leaving an empty schema and a persistent HTTP 500. - MARIADB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - - MARIADB_DATABASE=wallabag - - MARIADB_USER=wallabag - - MARIADB_PASSWORD=${SYMFONY__ENV__DATABASE_PASSWORD} volumes: - wallabag-db-data:/var/lib/mysql healthcheck: diff --git a/blueprints/wallabag/template.toml b/blueprints/wallabag/template.toml index 5153ab07..5094139e 100644 --- a/blueprints/wallabag/template.toml +++ b/blueprints/wallabag/template.toml @@ -2,6 +2,7 @@ main_domain = "${domain}" db_root_password = "${password:32}" db_password = "${password:32}" +app_secret = "${password:32}" from_email = "wallabag@example.com" [config] @@ -13,6 +14,7 @@ host = "${main_domain}" [config.env] MYSQL_ROOT_PASSWORD = "${db_root_password}" SYMFONY__ENV__DATABASE_PASSWORD = "${db_password}" -SYMFONY__ENV__DOMAIN_NAME = "https://${main_domain}" +SYMFONY__ENV__DOMAIN_NAME = "http://${main_domain}" SYMFONY__ENV__FROM_EMAIL = "${from_email}" SYMFONY__ENV__SERVER_NAME = "wallabag" +SYMFONY__ENV__SECRET = "${app_secret}"