diff --git a/Dockerfile b/Dockerfile index b361a10..12f865a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:edge LABEL maintainer "Marvin Steadfast " -ARG WALLABAG_VERSION=2.2.3 +ARG WALLABAG_VERSION=2.3.0 RUN set -ex \ && apk update \ diff --git a/README.md b/README.md index 90b3cd1..fdee7e1 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Default login is `wallabag:wallabag`. - `-e SYMFONY__ENV__MAILER_PASSWORD=...`(defaults to "~", the SMTP password) - `-e SYMFONY__ENV__FROM_EMAIL=...`(defaults to "wallabag@example.com", the address wallabag uses for outgoing emails) - `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration) +- `-e SYMFONY__ENV__DOMAIN_NAME=...` defaults to "https://your-wallabag-url-instance.com", the URL of your wallabag instance) - `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one) ## SQLite diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index 231cf81..f6b5210 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -20,6 +20,7 @@ mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}" from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}" registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}" + domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}" tasks: diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index f9f7270..9d23ffe 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -10,6 +10,8 @@ parameters: database_socket: null database_charset: utf8 + domain_name: {{ domain_name }} + mailer_transport: smtp mailer_host: {{ mailer_host }} mailer_user: {{ mailer_user }} @@ -45,6 +47,3 @@ parameters: redis_port: 6379 redis_path: null redis_password: null - - # sites credentials - sites_credentials: {} diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml index 4ad5739..9469a83 100644 --- a/root/var/www/wallabag/app/config/parameters.yml +++ b/root/var/www/wallabag/app/config/parameters.yml @@ -10,6 +10,8 @@ parameters: database_socket: null database_charset: utf8 + domain_name: https://your-wallabag-url-instance.com + test_database_driver: pdo_sqlite test_database_host: 127.0.0.1 test_database_port: ~ @@ -53,6 +55,3 @@ parameters: redis_port: 6379 redis_path: null redis_password: null - - # sites credentials - sites_credentials: {}