Skip to content

Commit

Permalink
Merge pull request #87 from bananenmannfrau/master
Browse files Browse the repository at this point in the history
makes email confirmation for user registration configurable
  • Loading branch information
nicosomb authored Dec 15, 2017
2 parents 7a476cd + dcaa684 commit 51e3b62
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]", the address wallabag uses for outgoing emails)
- `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration)
- `-e SYMFONY__ENV__FOSUSER_CONFIRMATION=...`(defaults to "true", enable or disable registration confirmation)
- `-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)

Expand Down
1 change: 1 addition & 0 deletions root/etc/ansible/entrypoint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}"
from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('[email protected]', true) }}"
registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}"
registration_mail_confirmation: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_CONFIRMATION')|default('true', true) }}"
domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}"

tasks:
Expand Down
2 changes: 1 addition & 1 deletion root/etc/ansible/templates/parameters.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ parameters:

# fosuser stuff
fosuser_registration: {{ registration }}
fosuser_confirmation: true
fosuser_confirmation: {{ registration_mail_confirmation }}

from_email: {{ from_email }}

Expand Down

0 comments on commit 51e3b62

Please sign in to comment.