Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MAILER options to run() and set default MAILER_ENABLED=0 #14

Open
wants to merge 3 commits into
base: rework_build_yarn
Choose a base branch
from
Open

Add MAILER options to run() and set default MAILER_ENABLED=0 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fda3b9
Add MAILER options to run() and set default MAILER_ENABLED=0
bsod-haunted May 3, 2022
683ba78
Update joplin
bsod-haunted May 3, 2022
fb0d3bf
Update joplin
bsod-haunted May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions default/joplin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

## Email configuration

# MAILER_ENABLED=1
# MAILER_ENABLED=0
# MAILER_HOST=smtp.me.org
# MAILER_PORT=465
# MAILER_SECURE=-1
# MAILER_SECURE=1
# [email protected]
# MAILER_AUTH_PASSWORD=joplin

Expand Down
11 changes: 10 additions & 1 deletion joplin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,17 @@ run(){
POSTGRES_PORT="${POSTGRES_PORT:-5432}"
POSTGRES_HOST="${POSTGRES_HOST:-localhost}"
RUNNING_IN_DOCKER=0

MAILER_ENABLED="${MAILER_ENABLED:-0}"
MAILER_HOST="${MAILER_HOST:-smtp.me.org}"
MAILER_PORT="${MAILER_PORT:-465}"
MAILER_SECURE="${MAILER_SECURE:-1}"
MAILER_AUTH_USER="${MAILER_AUTH_USER:[email protected]}"
MAILER_AUTH_PASSWORD="${MAILER_AUTH_PASSWORD:-joplin}"
MAILER_NOREPLY_EMAIL="${MAILER_NOREPLY_EMAIL:[email protected]}"
MAILER_NOREPLY_NAME="${MAILER_NOREPLY_NAME:-Joplin-Server}"

export APP_BASE_URL APP_PORT DB_CLIENT POSTGRES_PASSWORD POSTGRES_DATABASE POSTGRES_USER POSTGRES_PORT POSTGRES_HOST RUNNING_IN_DOCKER
export APP_BASE_URL APP_PORT DB_CLIENT POSTGRES_PASSWORD POSTGRES_DATABASE POSTGRES_USER POSTGRES_PORT POSTGRES_HOST RUNNING_IN_DOCKER MAILER_ENABLED MAILER_HOST MAILER_PORT MAILER_SECURE MAILER_AUTH_USER MAILER_AUTH_PASSWORD MAILER_NOREPLY_EMAIL MAILER_NOREPLY_NAME

cd $JOPLIN_HOME
mkdir -p logs
Expand Down