From be9d693e74e41fdcdb18bf80aa1aff614154bcce Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 1 Jun 2017 10:42:19 +0200 Subject: remove craueconfig domain name setting and add a proper one in parameters --- app/config/parameters.yml.dist | 2 ++ app/config/wallabag.yml | 1 + 2 files changed, 3 insertions(+) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index afcee039..c00ffb0e 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -23,6 +23,8 @@ parameters: # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 + domain_name: wallabag.me + mailer_transport: smtp mailer_host: 127.0.0.1 mailer_user: ~ diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d8c593c6..65bac1b4 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -26,6 +26,7 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 + domain_name: '%domain_name%' default_internal_settings: - name: share_public -- cgit v1.2.3 From d6c4c484c46706f9eecf81af3f64649f014418e1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 6 Jun 2017 16:04:51 +0200 Subject: add migration --- app/config/wallabag.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/config') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 65bac1b4..d03450a0 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -148,10 +148,6 @@ wallabag_core: name: wallabag_support_url value: https://www.wallabag.org/pages/support.html section: misc - - - name: wallabag_url - value: http://v2.wallabag.org - section: misc - name: api_user_registration value: 0 -- cgit v1.2.3 From e48b238a3e2c387be1f897e6f2c3c481d25f5203 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 6 Jun 2017 16:18:25 +0200 Subject: fix tests --- app/config/parameters_test.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 010785e6..92f0364f 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -8,3 +8,4 @@ parameters: test_database_path: "%env(TEST_DATABASE_PATH)%" env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_charset: utf8 + domain_name: 'http://v2.wallabag.org' -- cgit v1.2.3 From 80f4d85ac92ab4dc490c51f2d831ac7fa3853826 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 8 Jun 2017 19:15:33 +0200 Subject: Review --- app/config/parameters.yml.dist | 2 +- app/config/parameters_test.yml | 1 - app/config/wallabag.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c00ffb0e..d827219a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -23,7 +23,7 @@ parameters: # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 - domain_name: wallabag.me + domain_name: http://your-wallabag-url-instance.com mailer_transport: smtp mailer_host: 127.0.0.1 diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 92f0364f..010785e6 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml @@ -8,4 +8,3 @@ parameters: test_database_path: "%env(TEST_DATABASE_PATH)%" env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_charset: utf8 - domain_name: 'http://v2.wallabag.org' diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d03450a0..51b7e4e3 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -26,7 +26,6 @@ wallabag_core: fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 - domain_name: '%domain_name%' default_internal_settings: - name: share_public -- cgit v1.2.3 From 1a94252831638cf41f0fe489939dee9dae1c1251 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 9 Jun 2017 10:07:27 +0200 Subject: Promote https --- app/config/parameters.yml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d827219a..914fb1ef 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -23,7 +23,7 @@ parameters: # with PostgreSQL and SQLite, you must set "utf8" database_charset: utf8mb4 - domain_name: http://your-wallabag-url-instance.com + domain_name: https://your-wallabag-url-instance.com mailer_transport: smtp mailer_host: 127.0.0.1 -- cgit v1.2.3