From f88c29ddf9d5ee7c1240ee38a4e851550cb07ad0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Thu, 28 Sep 2017 16:42:10 +0200
Subject: [PATCH] Remove SMTP and use sendmail

---
 README.md          | 13 ++++++++++---
 conf/settings.py   |  7 +------
 scripts/_common.sh | 12 ------------
 scripts/install    |  5 ++---
 scripts/restore    |  2 +-
 scripts/upgrade    |  2 +-
 6 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 1d93cdf..fc10cfc 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,21 @@ The YunoHost team uses [Weblate](https://weblate.org) for translations: https://
 
 ## Admin
 
-An admin user is created at installation, the password is *weblate*.
+An admin user is created at installation, the login is what you provided at installation, the password is *weblate*.
+
+# Github
+
+Pulling works fine. But pushing still needs some love. Please read [Weblate's documentation about this](https://docs.weblate.org/en/latest/vcs.html).
+
+I understant we need to manually install [hub](https://github.com/github/hub), a tool that creates pull-requests.
+Which will require to download and install a binary file, as Debian 8 don't have Go>=1.8
 
 ## Weblate and databases
 
 Weblate [recommands PostgreSQL](https://docs.weblate.org/en/latest/admin/install.html#database-setup-for-weblate), but YunoHost uses Mysql.
 
-Carefull, this installs PostgreSQL and change default configuration to ask for every connexion and every user a password (local all all password).
+Carefull, this application install PostgreSQL and change the default configuration to ask for every connexion and every user a password (local all all password).
 
 ## LDAP connexion
 
-It doesn't work yet, but it looks doable: https://docs.weblate.org/en/latest/admin/auth.html?highlight=LDAP#ldap-authentication
+It doesn't work yet, but while [it looks doable](https://docs.weblate.org/en/latest/admin/auth.html?highlight=LDAP#ldap-authentication), I'm unsure it is a good idea to link this kind of tools to you LDAP.
diff --git a/conf/settings.py b/conf/settings.py
index da0f464..6517535 100644
--- a/conf/settings.py
+++ b/conf/settings.py
@@ -554,12 +554,7 @@ EMAIL_SEND_HTML = True
 # Subject of emails includes site title
 EMAIL_SUBJECT_PREFIX = '[{0}] '.format(SITE_TITLE)
 
-# SMTP settings
-EMAIL_HOST="localhost"
-EMAIL_HOST_USER="__NAME__"
-EMAIL_HOST_PASSWORD="__SMTPPWD__"
-EMAIL_PORT=465
-EMAIL_USE_SSL=True
+EMAIL_BACKEND = 'django_sendmail_backend.backends.EmailBackend'
 
 # Enable remote hooks
 ENABLE_HOOKS = True
diff --git a/scripts/_common.sh b/scripts/_common.sh
index fc320db..ec23885 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,17 +1,5 @@
 #!/bin/bash
 
-# Create a system user
-#
-# usage: ynh_system_user_create user_name [home_dir]
-# | arg: user_name - Name of the system user that will be create
-# | arg: password - user password (for SMTP access)
-ynh_system_user_create_smtp () {
-	if ! ynh_system_user_exists "$1"	# Check if the user exists on the system
-	then	# If the user doesn't exist
-		sudo useradd --no-create-home --system --user-group "$1" --shell /bin/false --password "$2" || ynh_die "Unable to create $1 system account"
-	fi
-}
-
 ynh_psql_test_if_first_run() {
 	if [ -f /etc/yunohost/psql ];
 	then
diff --git a/scripts/install b/scripts/install
index 4746d16..90d8590 100755
--- a/scripts/install
+++ b/scripts/install
@@ -104,8 +104,7 @@ ynh_add_nginx_config
 
 # Create system user for email notifications
 smtp_pwd=$(ynh_string_random)
-ynh_system_user_create_smtp "$app" "$smtp_pwd"
-ynh_app_setting_set "$app" smtppwd "$smtp_pwd"
+ynh_system_user_create "$app" "/home/$app"
 
 #=================================================
 # SPECIFIC SETUP
@@ -137,7 +136,7 @@ virtualenv "${final_path}/venv"
 	set +eu
 	source "${final_path}/venv/bin/activate"
 	"${final_path}/venv/bin/pip" install Weblate==2.16
-	"${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2
+	"${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 django_sendmail_backend
 )
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 78d86d1..0f66c73 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -62,7 +62,7 @@ ynh_restore_file "$final_path"
 #=================================================
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create_smtp "$app" "$smtp_pwd"
+ynh_system_user_create "$app" "/home/$app"
 
 #=================================================
 # RESTORE USER RIGHTS
diff --git a/scripts/upgrade b/scripts/upgrade
index dd690cb..c4fbfaa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,7 +64,7 @@ ynh_add_nginx_config
 #=================================================
 
 # Create a system user
-ynh_system_user_create_smtp "$app" "$smtp_pwd"
+ynh_system_user_create "$app" "/home/$app"
 
 #=================================================
 # SPECIFIC UPGRADE