From cf4f519cc051966aa58b3f2c1ac6fb674461f279 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 12 Aug 2014 11:18:45 +0000
Subject: [PATCH] zpush/owncloud: inject mail using 'sendmail' not SMTP

---
 conf/zpush/backend_imap.php |  2 +-
 setup/owncloud.sh           | 20 ++++++++++----------
 setup/start.sh              |  7 -------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php
index 252814a..4559409 100644
--- a/conf/zpush/backend_imap.php
+++ b/conf/zpush/backend_imap.php
@@ -32,7 +32,7 @@ define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>');
 define('IMAP_SENTFOLDER', '');
 define('IMAP_INLINE_FORWARD', true);
 define('IMAP_EXCLUDED_FOLDERS', '');
-define('IMAP_SMTP_METHOD', 'smtp');
+define('IMAP_SMTP_METHOD', 'sendmail');
 
 global $imap_smtp_params;
 $imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 9944544..12059ff 100644
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -38,16 +38,16 @@ if [ ! -f "/usr/local/lib/owncloud/config/config.php" ]; then
   "memcached_servers" => array (
     array('localhost', 11211),
   ),
-  'mail_smtpmode' => 'smtp',
-  'mail_smtpsecure' => 'tls',
-  'mail_from_address' => 'no-reply',
-  'mail_domain' => '$PRIMARY_HOSTNAME',
+  'mail_smtpmode' => 'sendmail',
+  'mail_smtpsecure' => '',
   'mail_smtpauthtype' => 'LOGIN',
-  'mail_smtpauth' => true,
-  'mail_smtphost' => 'localhost',
-  'mail_smtpport' => '587',
-  'mail_smtpname' => 'no-reply@$PRIMARY_HOSTNAME',
-  'mail_smtppassword' => '$SECRET_PASSWORD',
+  'mail_smtpauth' => false,
+  'mail_smtphost' => '',
+  'mail_smtpport' => '',
+  'mail_smtpname' => '',
+  'mail_smtppassword' => '',
+  'mail_from_address' => 'owncloud',
+  'mail_domain' => '$PRIMARY_HOSTNAME',
   'logtimezone' => '$TIMEZONE',
 );
 ?>
@@ -78,4 +78,4 @@ chmod -R 777 /usr/local/lib/owncloud/apps/mail/vendor/ezyang/htmlpurifier/librar
 (crontab -u www-user -l; echo "*/15  *  *  *  * php -f /usr/local/lib/owncloud/cron.php" ) | crontab -u www-user -
 
 php5enmod imap
-restart_service php5-fpm
\ No newline at end of file
+restart_service php5-fpm
diff --git a/setup/start.sh b/setup/start.sh
index 26a081d..3998740 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -250,15 +250,11 @@ if [ -z "$STORAGE_ROOT" ]; then
 	chown $STORAGE_USER.$STORAGE_USER $STORAGE_ROOT/mailinabox.version
 fi
 
-# Generate a secret password to use with no-reply user (mainly for ownCloud SMTP atm)
-SECRET_PASSWORD=$(dd if=/dev/random bs=20 count=1 2>/dev/null | base64 | fold -w 24 | head -n 1)
-
 # Save the global options in /etc/mailinabox.conf so that standalone
 # tools know where to look for data.
 cat > /etc/mailinabox.conf << EOF;
 STORAGE_USER=$STORAGE_USER
 STORAGE_ROOT=$STORAGE_ROOT
-SECRET_PASSWORD=$SECRET_PASSWORD
 PRIMARY_HOSTNAME=$PRIMARY_HOSTNAME
 PUBLIC_IP=$PUBLIC_IP
 PUBLIC_IPV6=$PUBLIC_IPV6
@@ -323,8 +319,5 @@ if [ -z "`tools/mail.py user`" ]; then
 
 	# Create an alias to which we'll direct all automatically-created administrative aliases.
 	tools/mail.py alias add administrator@$PRIMARY_HOSTNAME $EMAIL_ADDR
-
-	# Create an no-reply user to use with ownCloud
-	tools/mail.py user add no-reply@$PRIMARY_HOSTNAME $SECRET_PASSWORD
 fi