diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-10 11:36:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-10 11:36:03 +0200 |
commit | 679aaf08366c265b29d0e4b2e59919314cf338f9 (patch) | |
tree | 6b340839afa56747b6fa8aff3ede2f59d4dcc6d3 /app/config | |
parent | a8993999893fb665b5e96597f9b649a2a8b940a2 (diff) | |
parent | 1a94252831638cf41f0fe489939dee9dae1c1251 (diff) | |
download | wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.tar.gz wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.tar.zst wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.zip |
Merge pull request #3173 from wallabag/domain-name-param
remove craueconfig domain name setting and add a proper one in parame…
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/parameters.yml.dist | 2 | ||||
-rw-r--r-- | app/config/wallabag.yml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index afcee039..914fb1ef 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -23,6 +23,8 @@ parameters: | |||
23 | # with PostgreSQL and SQLite, you must set "utf8" | 23 | # with PostgreSQL and SQLite, you must set "utf8" |
24 | database_charset: utf8mb4 | 24 | database_charset: utf8mb4 |
25 | 25 | ||
26 | domain_name: https://your-wallabag-url-instance.com | ||
27 | |||
26 | mailer_transport: smtp | 28 | mailer_transport: smtp |
27 | mailer_host: 127.0.0.1 | 29 | mailer_host: 127.0.0.1 |
28 | mailer_user: ~ | 30 | mailer_user: ~ |
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d8c593c6..51b7e4e3 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -148,10 +148,6 @@ wallabag_core: | |||
148 | value: https://www.wallabag.org/pages/support.html | 148 | value: https://www.wallabag.org/pages/support.html |
149 | section: misc | 149 | section: misc |
150 | - | 150 | - |
151 | name: wallabag_url | ||
152 | value: http://v2.wallabag.org | ||
153 | section: misc | ||
154 | - | ||
155 | name: api_user_registration | 151 | name: api_user_registration |
156 | value: 0 | 152 | value: 0 |
157 | section: api | 153 | section: api |