mirror of
https://github.com/ENSL/ensl.org.git
synced 2025-01-26 11:11:20 +00:00
Fixing Password Rest
* Reverting 'forgot' view back to a form * Adding smtp configuration for production * Adding postfix image to docker-compose
This commit is contained in:
parent
d27e72b6e4
commit
7ec019fda6
5 changed files with 40 additions and 4 deletions
|
@ -1,2 +1,5 @@
|
||||||
Dockerfile
|
Dockerfile
|
||||||
db_data
|
db_data
|
||||||
|
dkim
|
||||||
|
log/*
|
||||||
|
public/*
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -18,6 +18,9 @@
|
||||||
db_data/*
|
db_data/*
|
||||||
!db_data/.placeholder
|
!db_data/.placeholder
|
||||||
|
|
||||||
|
# ignore dkim keys
|
||||||
|
dkim
|
||||||
|
|
||||||
# OS X
|
# OS X
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,22 @@
|
||||||
<h1>Password Recovery</h1>
|
<h1>Password Recovery</h1>
|
||||||
|
|
||||||
<p><strong>We are currently unable to send automated emails!</strong></p>
|
<p>If you do not receive your new password by email, please see the guide <a href="https://www.ensl.org/articles/1042">here</a>.</p>
|
||||||
<p>Please see the guide <a href="https://www.ensl.org/articles/1042">here</a> on instructions on requesting a password reset.</p>
|
|
||||||
|
<%= form_tag({ controller: 'users', action: 'forgot' }, { class: 'square' }) do %>
|
||||||
|
<div class="fields horizontal">
|
||||||
|
<%= label_tag :username %>
|
||||||
|
<%= text_field_tag :username %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fields horizontal">
|
||||||
|
<%= label_tag :email %>
|
||||||
|
<%= text_field_tag :email %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="controls">
|
||||||
|
<%= submit_tag "Recover password" %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Special characters have been removed from nicks. <br> You may need to
|
Special characters have been removed from nicks. <br> You may need to
|
||||||
|
|
|
@ -48,8 +48,13 @@ Ensl::Application.configure do
|
||||||
# Disable delivery errors, bad email addresses will be ignored
|
# Disable delivery errors, bad email addresses will be ignored
|
||||||
# config.action_mailer.raise_delivery_errors = false
|
# config.action_mailer.raise_delivery_errors = false
|
||||||
|
|
||||||
# Use sendmail
|
# Use smtp-Server
|
||||||
config.action_mailer.delivery_method = :sendmail
|
config.action_mailer.delivery_method = :smtp
|
||||||
|
config.action_mailer.smtp_settings = {
|
||||||
|
address: 'smtp',
|
||||||
|
domain: 'ensl.org'
|
||||||
|
}
|
||||||
|
|
||||||
config.action_mailer.raise_delivery_errors = true
|
config.action_mailer.raise_delivery_errors = true
|
||||||
|
|
||||||
# Enable threaded mode
|
# Enable threaded mode
|
||||||
|
|
|
@ -5,11 +5,13 @@ services:
|
||||||
image: ensl/ensl.org:latest
|
image: ensl/ensl.org:latest
|
||||||
volumes:
|
volumes:
|
||||||
- "../public:/var/www/public"
|
- "../public:/var/www/public"
|
||||||
|
- "../logs:/var/www/log"
|
||||||
ports:
|
ports:
|
||||||
- "4000:4000"
|
- "4000:4000"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- memcached
|
- memcached
|
||||||
|
- smtp
|
||||||
# - redis
|
# - redis
|
||||||
db:
|
db:
|
||||||
image: mariadb:latest
|
image: mariadb:latest
|
||||||
|
@ -26,5 +28,13 @@ services:
|
||||||
# - MYSQL_ROOT_HOST
|
# - MYSQL_ROOT_HOST
|
||||||
memcached:
|
memcached:
|
||||||
image: memcached:latest
|
image: memcached:latest
|
||||||
|
smtp:
|
||||||
|
image: mwader/postfix-relay:latest
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- "../dkim:/etc/opendkim/keys"
|
||||||
|
environment:
|
||||||
|
- POSTFIX_myhostname=ensl.org
|
||||||
|
- OPENDKIM_DOMAINS=ensl.org
|
||||||
#redis:
|
#redis:
|
||||||
# image: redis
|
# image: redis
|
||||||
|
|
Loading…
Reference in a new issue