From cc8e1fa7b76bcc807c5bf9659f00d733b075bb84 Mon Sep 17 00:00:00 2001
From: jkaberg <joel@jkaberg.com>
Date: Mon, 11 Aug 2014 19:09:42 +0200
Subject: [PATCH] set working dir for composer

---
 setup/owncloud.sh |   2 +-
 setup/webmail.sh  | 103 ----------------------------------------------
 2 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100755 setup/webmail.sh

diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 4f4192d0..76395d7e 100644
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -43,7 +43,7 @@ cat - > /usr/local/lib/owncloud/config/config.php <<EOF;
 \);
 EOF
 
-# Insert the following above (owncloud config generation) when we found a good solution:
+# TODO: Insert the following above (owncloud config generation) when we found a good solution:
 #  'mail_smtpmode' => 'smtp',
 #  'mail_smtpsecure' => 'ssl',
 #  'mail_from_address' => '**** need to figure this one out, nornamly: <user>@<domain>.<tld> ****',
diff --git a/setup/webmail.sh b/setup/webmail.sh
deleted file mode 100755
index 93e79889..00000000
--- a/setup/webmail.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-# Webmail: Using roundcube
-##########################
-
-source setup/functions.sh # load our functions
-source /etc/mailinabox.conf # load global vars
-
-# Ubuntu's roundcube-core has dependencies on Apache & MySQL, which we don't want, so we can't
-# install roundcube directly via apt-get install.
-#
-# Additionally, the Roundcube shipped with Ubuntu is consistently out of date.
-#
-# And it's packaged incorrectly --- it seems to be missing a directory of files.
-#
-# So we'll use apt-get to manually install the dependencies of roundcube that we know we need,
-# and then we'll manually install roundcube from source.
-
-# These dependencies are from 'apt-cache showpkg roundcube-core'.
-apt_install \
-	dbconfig-common \
-	php5 php5-sqlite php5-mcrypt php5-intl php5-json php5-common php-auth php-net-smtp php-net-socket php-net-sieve php-mail-mime php-crypt-gpg php5-gd php5-pspell \
-	tinymce libjs-jquery libjs-jquery-mousewheel libmagic1
-
-# We used to install Roundcube from Ubuntu, without triggering the dependencies
-# on Apache and MySQL, by downloading the debs and installing them manually.
-# Now that we're beyond that, get rid of those debs before installing from source.
-apt-get purge -qq -y roundcube*
-
-# Install Roundcube from source if it is not already present.
-# TODO: Check version?
-if [ ! -d /usr/local/lib/roundcubemail ]; then
-	rm -f /tmp/roundcube.tgz
-	wget -qO /tmp/roundcube.tgz http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/1.0.1/roundcubemail-1.0.1.tar.gz
-	tar -C /usr/local/lib -zxf /tmp/roundcube.tgz
-	mv /usr/local/lib/roundcubemail-1.0.1/ /usr/local/lib/roundcubemail
-	rm -f /tmp/roundcube.tgz
-fi
-
-# Generate a safe 24-character secret key of safe characters.
-SECRET_KEY=$(dd if=/dev/random bs=20 count=1 2>/dev/null | base64 | fold -w 24 | head -n 1)
-
-# Create a configuration file.
-#
-# For security, temp and log files are not stored in the default locations
-# which are inside the roundcube sources directory. We put them instead
-# in normal places.
-cat - > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
-<?php
-/*
- * Do not edit. Written by Mail-in-a-Box. Regenerated on updates.
- */
-\$config = array();
-\$config['log_dir'] = '/var/log/roundcubemail/';
-\$config['temp_dir'] = '/tmp/roundcubemail/';
-\$config['db_dsnw'] = 'sqlite:///$STORAGE_ROOT/mail/roundcube/roundcube.sqlite?mode=0640';
-\$config['default_host'] = 'ssl://localhost';
-\$config['default_port'] = 993;
-\$config['imap_timeout'] = 15;
-\$config['smtp_server'] = 'tls://localhost';
-\$config['smtp_port'] = 587;
-\$config['smtp_user'] = '%u';
-\$config['smtp_pass'] = '%p';
-\$config['support_url'] = 'https://mailinabox.email/';
-\$config['product_name'] = 'Mail-in-a-Box/Roundcube Webmail';
-\$config['des_key'] = '$SECRET_KEY';
-\$config['plugins'] = array('archive', 'zipdownload', 'password', 'managesieve');
-\$config['skin'] = 'classic';
-\$config['login_autocomplete'] = 2;
-\$config['password_charset'] = 'UTF-8';
-\$config['junk_mbox'] = 'Spam';
-?>
-EOF
-
-# Create writable directories.
-mkdir -p /var/log/roundcubemail /tmp/roundcubemail $STORAGE_ROOT/mail/roundcube
-chown -R www-data.www-data /var/log/roundcubemail /tmp/roundcubemail $STORAGE_ROOT/mail/roundcube
-
-# Password changing plugin settings
-# The config comes empty by default, so we need the settings 
-# we're not planning to change in config.inc.dist...
-cp /usr/local/lib/roundcubemail/plugins/password/config.inc.php.dist \
-	/usr/local/lib/roundcubemail/plugins/password/config.inc.php
-
-tools/editconf.py /usr/local/lib/roundcubemail/plugins/password/config.inc.php \
-	"\$config['password_minimum_length']=6;" \
-	"\$config['password_db_dsn']='sqlite:///$STORAGE_ROOT/mail/users.sqlite';" \
-	"\$config['password_query']='UPDATE users SET password=%D WHERE email=%u';" \
-	"\$config['password_dovecotpw']='/usr/bin/doveadm pw';" \
-	"\$config['password_dovecotpw_method']='SHA512-CRYPT';" \
-	"\$config['password_dovecotpw_with_method']=true;"
-
-# so PHP can use doveadm, for the password changing plugin
-usermod -a -G dovecot www-data
-
-# set permissions so that PHP can use users.sqlite
-# could use dovecot instead of www-data, but not sure it matters
-chown root.www-data $STORAGE_ROOT/mail
-chmod 775 $STORAGE_ROOT/mail
-chown root.www-data $STORAGE_ROOT/mail/users.sqlite 
-chmod 664 $STORAGE_ROOT/mail/users.sqlite 
-
-# Enable PHP modules.
-php5enmod mcrypt
-restart_service php-fastcgi
\ No newline at end of file