aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2018-10-11 09:34:52 +0000
committerGitHub <noreply@github.com>2018-10-11 09:34:52 +0000
commit43b6f3a8a8173c47475632ca2869f190b552b5d6 (patch)
tree37adb96d9f1e28eefb1658a7481bc9ab5bbd83f1 /app/config
parent102f57941ebfd03899760f8add0701952b4d982f (diff)
parent6a3187066f2f60120acd11b207a40bbd6d6d9519 (diff)
downloadwallabag-43b6f3a8a8173c47475632ca2869f190b552b5d6.tar.gz
wallabag-43b6f3a8a8173c47475632ca2869f190b552b5d6.tar.zst
wallabag-43b6f3a8a8173c47475632ca2869f190b552b5d6.zip
Merge pull request #3596 from glego/add-secure-email
Add secure email
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml11
-rw-r--r--app/config/parameters.yml.dist11
2 files changed, 14 insertions, 8 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 951cdf71..092f3ec0 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -79,10 +79,13 @@ doctrine_migrations:
79 79
80# Swiftmailer Configuration 80# Swiftmailer Configuration
81swiftmailer: 81swiftmailer:
82 transport: "%mailer_transport%" 82 transport: "%mailer_transport%"
83 host: "%mailer_host%" 83 username: "%mailer_user%"
84 username: "%mailer_user%" 84 password: "%mailer_password%"
85 password: "%mailer_password%" 85 host: "%mailer_host%"
86 port: "%mailer_port%"
87 encryption: "%mailer_encryption%"
88 auth_mode: "%mailer_auth_mode%"
86 spool: 89 spool:
87 type: memory 90 type: memory
88 91
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 6b0cb8e8..d21f20e0 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -27,10 +27,13 @@ parameters:
27 27
28 domain_name: https://your-wallabag-url-instance.com 28 domain_name: https://your-wallabag-url-instance.com
29 29
30 mailer_transport: smtp 30 mailer_transport: smtp
31 mailer_host: 127.0.0.1 31 mailer_user: ~
32 mailer_user: ~ 32 mailer_password: ~
33 mailer_password: ~ 33 mailer_host: 127.0.0.1
34 mailer_port: false
35 mailer_encryption: ~
36 mailer_auth_mode: ~
34 37
35 locale: en 38 locale: en
36 39