external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update to Roundcube 1.0.1

This commit is contained in:
Joshua Tauberer 2014-07-08 00:37:53 +00:00
parent 7339bf080a
commit 3bab63d4ce
2 changed files with 75 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/nginx.conf
View File

@ -31,13 +31,17 @@ server {
rewrite ^/mail/$ /mail/index.php; rewrite ^/mail/$ /mail/index.php;
location /mail/ { location /mail/ {
index index.php; index index.php;
alias /var/lib/roundcube/; alias /usr/local/lib/roundcubemail/;
}
location ~ /mail/config/.* {
# A ~-style location is needed to give this precedence over the next block.
return 403;
} }
location ~ /mail/.*\.php { location ~ /mail/.*\.php {
include fastcgi_params; include fastcgi_params;
fastcgi_split_path_info ^/mail(/.*)()$; fastcgi_split_path_info ^/mail(/.*)()$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /var/lib/roundcube/$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME /usr/local/lib/roundcubemail/$fastcgi_script_name;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock; fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
client_max_body_size 20M; client_max_body_size 20M;
} }

125
setup/webmail.sh
View File

@ -5,9 +5,14 @@ source setup/functions.sh # load our functions
source /etc/mailinabox.conf # load global vars 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 # 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. We'll use apt-get to manually install the # install roundcube directly via apt-get install.
# dependencies of roundcube that we know we need, and then we'll manually install debs for #
# roundcube using dpkg so that dependencies aren't triggered. # 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'. # These dependencies are from 'apt-cache showpkg roundcube-core'.
apt_install \ apt_install \
@ -15,67 +20,75 @@ apt_install \
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 \ 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 tinymce libjs-jquery libjs-jquery-mousewheel libmagic1
mkdir -p /tmp/roundcube_debs # We used to install Roundcube from Ubuntu, without triggering the dependencies
pushd /tmp/roundcube_debs # on Apache and MySQL, by downloading the debs and installing them manually.
apt-get download roundcube roundcube-core roundcube-sqlite3 roundcube-plugins # Now that we're beyond that, get rid of those debs before installing from source.
DEBIAN_FRONTEND=noninteractive dpkg -Gi *.deb apt-get purge -qq -y roundcube*
popd
rm -rf /tmp/roundcube_debs
apt-mark hold roundcube-core # hopefully apt-get won't attempt to upgrade it, which might trigger dependenciees?
# Buuuut.... the .deb is missing things? # Install Roundcube from source if it is not already present.
src_fn=roundcube_0.9.5.orig.tar.gz # TODO: Check version?
src_dir=roundcubemail-0.9.5-dep if [ ! -d /usr/local/lib/roundcubemail ]; then
mkdir -p externals rm -f /tmp/roundcube.tgz
wget -nc -P externals http://ftp.debian.org/debian/pool/main/r/roundcube/$src_fn wget -O /tmp/roundcube.tgz http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/1.0.1/roundcubemail-1.0.1.tar.gz
tar -C /tmp -xzf $(pwd)/externals/$src_fn tar -C /usr/local/lib -zxf /tmp/roundcube.tgz
if [ ! -d /var/lib/roundcube/SQL ]; then mv /tmp/$src_dir/SQL/ /var/lib/roundcube/; fi mv /usr/local/lib/roundcubemail-1.0.1/ /usr/local/lib/roundcubemail
rm -rf /tmp/$src_dir rm -f /tmp/roundcube.tgz
fi
# Settings # Generate a safe 24-character secret key of safe characters.
tools/editconf.py /etc/roundcube/main.inc.php \ SECRET_KEY=$(dd if=/dev/urandom bs=20 count=1 2>/dev/null | base64 | fold -w 24 | head -n 1)
"\$rcmail_config['default_host']='ssl://localhost';" \
"\$rcmail_config['default_port']=993;" \ # Create a configuration file.
"\$rcmail_config['imap_timeout']=30;" \ #
"\$rcmail_config['smtp_server']='tls://localhost';"\ # For security, temp and log files are not stored in the default locations
"\$rcmail_config['smtp_user']='%u';"\ # which are inside the roundcube sources directory. We put them instead
"\$rcmail_config['smtp_pass']='%p';"\ # in normal places.
"\$rcmail_config['smtp_timeout']=30;" \ cat - > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
"\$rcmail_config['use_https']=true;" \ <?php
"\$rcmail_config['session_lifetime']=60*24*3;" \ /*
"\$rcmail_config['password_charset']='utf8';" \ * Do not edit. Written by Mail-in-a-Box. Regenerated on updates.
"\$rcmail_config['message_sort_col']='arrival';" \ */
"\$rcmail_config['junk_mbox']='Spam';" \ \$config = array();
"\$rcmail_config['default_folders']=array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash');" \ \$config['log_dir'] = '/var/log/roundcubemail/';
"\$rcmail_config['draft_autosave']=30;" \ \$config['temp_dir'] = '/tmp/roundcubemail/';
"\$rcmail_config['plugins']=array('password');" \$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');
\$config['skin'] = 'larry';
\$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 # Password changing plugin settings
# The config comes empty by default, so we need the settings # The config comes empty by default, so we need the settings
# we're not planning to change in config.inc.dist... # we're not planning to change in config.inc.dist...
cp /usr/share/roundcube/plugins/password/config.inc.php.dist \ cp /usr/local/lib/roundcubemail/plugins/password/config.inc.php.dist \
/etc/roundcube/plugins/password/config.inc.php /usr/local/lib/roundcubemail/plugins/password/config.inc.php
tools/editconf.py /etc/roundcube/plugins/password/config.inc.php \ tools/editconf.py /usr/local/lib/roundcubemail/plugins/password/config.inc.php \
"\$rcmail_config['password_minimum_length']=6;" \ "\$config['password_minimum_length']=6;" \
"\$rcmail_config['password_db_dsn']='sqlite:///$STORAGE_ROOT/mail/users.sqlite';" \ "\$config['password_db_dsn']='sqlite:///$STORAGE_ROOT/mail/users.sqlite';" \
"\$rcmail_config['password_query']='UPDATE users SET password=%D WHERE email=%u';" \ "\$config['password_query']='UPDATE users SET password=%D WHERE email=%u';" \
"\$rcmail_config['password_dovecotpw']='/usr/bin/doveadm pw';" \ "\$config['password_dovecotpw']='/usr/bin/doveadm pw';" \
"\$rcmail_config['password_dovecotpw_method']='SHA512-CRYPT';" \ "\$config['password_dovecotpw_method']='SHA512-CRYPT';" \
"\$rcmail_config['password_dovecotpw_with_method']=true;" "\$config['password_dovecotpw_with_method']=true;"
# Configure storage of user preferences. # so PHP can use doveadm, for the password changing plugin
mkdir -p $STORAGE_ROOT/mail/roundcube
cat - > /etc/roundcube/debian-db.php <<EOF;
<?php
\$dbtype = 'sqlite';
\$basepath = '$STORAGE_ROOT/mail/roundcube';
\$dbname = 'roundcube.sqlite';
?>
EOF
chown -R www-data.www-data $STORAGE_ROOT/mail/roundcube
# so PHP can use doveadm
usermod -a -G dovecot www-data usermod -a -G dovecot www-data
# set permissions so that PHP can use users.sqlite # set permissions so that PHP can use users.sqlite