Skip to content

Commit e9e08cd

Browse files
committed
roundcube pear
1 parent 13d9dea commit e9e08cd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

ee/cli/plugins/stack.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1912,7 +1912,7 @@ def post_pref(self, apt_packages, packages):
19121912

19131913
#Fix pear install config for trusty
19141914
if EEVariables.ee_platform_codename == 'trusty':
1915-
EEShellExec.cmd_exec(self, "pear config-set php_dir /lib/php/pear")
1915+
EEShellExec.cmd_exec(self, "pear config-set php_dir /usr/share/php")
19161916
EEShellExec.cmd_exec(self, "pear config-set doc_dir /lib/php/pear/docs")
19171917
EEShellExec.cmd_exec(self, "pear config-set cfg_dir /lib/php/pear/cfg")
19181918
EEShellExec.cmd_exec(self, "pear config-set data_dir /lib/php/pear/data")
@@ -1923,6 +1923,8 @@ def post_pref(self, apt_packages, packages):
19231923
" Mail_mimeDecode Net_IDNA2-beta "
19241924
"Auth_SASL Net_Sieve Crypt_GPG")
19251925

1926+
# pear install Mail_Mime Net_SMTP Mail_mimeDecode Net_IDNA2-beta Auth_SASL Net_Sieve Crypt_GPG
1927+
19261928
# Configure roundcube database
19271929
rc_passwd = ''.join(random.sample(string.ascii_letters, 8))
19281930
Log.debug(self, "Creating Database roundcubemail")

ee/core/variables.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ class EEVariables():
168168
ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d",
169169
"dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve",
170170
"dovecot-managesieved", "postfix-mysql", "php5-cgi",
171-
"php-gettext", "php-pear", "subversion"]
171+
"php-gettext", "php-pear"]
172172
else:
173173
ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d",
174174
"dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve",
175175
"dovecot-managesieved", "postfix-mysql", "php5.6-cgi",
176-
"php-gettext", "php-pear"]
176+
"php-gettext", "php-pear", "subversion"]
177177

178178
# Mailscanner repo and packages
179179
ee_mailscanner_repo = ()

0 commit comments

Comments
 (0)