diff --git a/Dockerfile b/Dockerfile index 49aa1c3..8715128 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,6 +56,7 @@ RUN set -ex \ && ln -sf /dev/stderr /var/log/nginx/error.log \ && curl -s https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer \ + && composer selfupdate --1 \ && git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag COPY root / diff --git a/README.md b/README.md index 268f494..aa2527c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Default login is `wallabag:wallabag`. - `-e POSTGRES_PASSWORD=...` (needed for the postgres container to initialise and for the entrypoint in the wallabag container to create a database and user if not there) - `-e POSTGRES_USER=...` (needed for the posgres container to initialise and for the entrypoint in the wallabag container to create a database and user if not there) - `-e SYMFONY__ENV__DATABASE_DRIVER=...` (defaults to "pdo_sqlite", this sets the database driver to use) -- `-e SYMFONY__ENV__DATABASE_DRIVER_CLASS=...` (sets the database driver class to use) - `-e SYMFONY__ENV__DATABASE_HOST=...` (defaults to "127.0.0.1", if use mysql this should be the name of the mariadb container) - `-e SYMFONY__ENV__DATABASE_PORT=...` (port of the database host) - `-e SYMFONY__ENV__DATABASE_NAME=...`(defaults to "symfony", this is the name of the database to use) @@ -73,7 +72,7 @@ For using PostgreSQL you have to define some environment variables with the cont ``` $ docker run --name wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -d postgres:9.6 -$ docker run --name wallabag --link wallabag-db:wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -e "SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql" -e 'SYMFONY__ENV__DATABASE_DRIVER_CLASS=Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver' -e "SYMFONY__ENV__DATABASE_HOST=wallabag-db" -e "SYMFONY__ENV__DATABASE_PORT=5432" -e "SYMFONY__ENV__DATABASE_NAME=wallabag" -e "SYMFONY__ENV__DATABASE_USER=wallabag" -e "SYMFONY__ENV__DATABASE_PASSWORD=wallapass" -p 80:80 wallabag/wallabag +$ docker run --name wallabag --link wallabag-db:wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -e "SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql" -e "SYMFONY__ENV__DATABASE_HOST=wallabag-db" -e "SYMFONY__ENV__DATABASE_PORT=5432" -e "SYMFONY__ENV__DATABASE_NAME=wallabag" -e "SYMFONY__ENV__DATABASE_USER=wallabag" -e "SYMFONY__ENV__DATABASE_PASSWORD=wallapass" -p 80:80 wallabag/wallabag ``` ## Redis diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index e8a95b6..779120e 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -5,7 +5,6 @@ vars: database_driver: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_DRIVER')|default('pdo_sqlite', true) }}" - database_driver_class: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_DRIVER_CLASS')|default('~', true) }}" database_host: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_HOST')|default('127.0.0.1', true) }}" database_name: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_NAME')|default('symfony', true) }}" database_password: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_PASSWORD')|default('~', true) }}" diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index 40ab7b4..3b5a106 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -1,6 +1,5 @@ parameters: database_driver: {{ database_driver }} - database_driver_class: {{ database_driver_class }} database_host: {{ database_host }} database_port: {{ database_port }} database_name: {{ database_name }} @@ -34,6 +33,11 @@ parameters: fosuser_registration: {{ registration }} fosuser_confirmation: {{ registration_mail_confirmation }} + # how long the access token should live in seconds for the API + fos_oauth_server_access_token_lifetime: 3600 + # how long the refresh token should life in seconds for the API + fos_oauth_server_refresh_token_lifetime: 1209600 + from_email: {{ from_email }} rss_limit: 50 @@ -52,5 +56,5 @@ parameters: redis_path: {{ redis_path }} redis_password: {{ redis_password }} - # Sentry + # sentry logging sentry_dsn: {{ sentry_dsn }} diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml index 69c5ddb..1819c07 100644 --- a/root/var/www/wallabag/app/config/parameters.yml +++ b/root/var/www/wallabag/app/config/parameters.yml @@ -9,18 +9,9 @@ parameters: database_table_prefix: wallabag_ database_socket: null database_charset: utf8 - database_driver_class: null domain_name: https://your-wallabag-url-instance.com - test_database_driver: pdo_sqlite - test_database_host: 127.0.0.1 - test_database_port: ~ - test_database_name: ~ - test_database_user: ~ - test_database_password: ~ - test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" - mailer_transport: smtp mailer_user: ~ mailer_password: ~ @@ -42,6 +33,11 @@ parameters: fosuser_registration: true fosuser_confirmation: true + # how long the access token should live in seconds for the API + fos_oauth_server_access_token_lifetime: 3600 + # how long the refresh token should life in seconds for the API + fos_oauth_server_refresh_token_lifetime: 1209600 + from_email: no-reply@wallabag.org rss_limit: 50 @@ -60,5 +56,5 @@ parameters: redis_path: null redis_password: null - # Sentry + # sentry logging sentry_dsn: ~ diff --git a/tests/docker-compose.postgresql.yml b/tests/docker-compose.postgresql.yml index e961487..2ee5fc6 100644 --- a/tests/docker-compose.postgresql.yml +++ b/tests/docker-compose.postgresql.yml @@ -10,7 +10,6 @@ services: - POSTGRES_USER=my-super-user - SYMFONY__ENV__SECRET=F00B4R - SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql - - SYMFONY__ENV__DATABASE_DRIVER_CLASS=Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver - SYMFONY__ENV__DATABASE_HOST=db - SYMFONY__ENV__DATABASE_PORT=5432 - SYMFONY__ENV__DATABASE_NAME=wallabag diff --git a/tests/test_login.py b/tests/test_login.py index dd0f362..1a398fc 100644 --- a/tests/test_login.py +++ b/tests/test_login.py @@ -10,7 +10,7 @@ def test_accessing_login_page(): r = requests.get(URL, allow_redirects=True) assert r.status_code == 200 - assert 'Login' in r.text + assert 'Log in' in r.text assert 'Password' in r.text assert 'Register' in r.text assert 'Username' in r.text