external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204

Browse Source 
# Conflicts:
#	README.md
#	setup/mail-dovecot.sh
#	setup/system.sh
#	setup/webmail.sh
#	setup/zpush.sh
#	tests/test_mail.py
This commit is contained in:
downtownallday
2022-01-11 16:39:39 -05:00
parent d6cd4e826c 3998214e87
commit 4e6550ed22
31 changed files with 259 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system-setup/setup-defaults.sh
View File

@@ -42,4 +42,4 @@ export UPSTREAM_TAG="${UPSTREAM_TAG:-}"
# For setup scripts that install miabldap releases
export MIABLDAP_GIT="${MIABLDAP_GIT:-https://github.com/downtownallday/mailinabox-ldap.git}"
export MIABLDAP_RELEASE_TAG="${MIABLDAP_RELEASE_TAG:-v0.54}"
export MIABLDAP_RELEASE_TAG="${MIABLDAP_RELEASE_TAG:-v55}"

10
tests/system-setup/upgrade-from-upstream.sh
View File

@@ -78,16 +78,6 @@ upstream_install() {
sed -i 's|\(.*include:.*zones\.conf.*\)|cat >> /etc/nsd/nsd.conf <<EOF\n do-ip4: yes\n do-ip6: no\nremote-control:\n control-enable: no\nEOF\n\n\1|' setup/dns.sh \
|| die "Couldn't patch setup/dns.sh !!"
fi
if [ ! -z "$PHP_XSL_PACKAGE" ]; then
# For Github Actions - github's ubuntu 18 includes multiple
# PHP versions pre-installed and the php-xsl package for these
# versions is a virtual package of package php-xml. To handle
# this, change the setup scripts so that $PHP_XSL_PACKAGE
# (php-xml) is installed instead of php-xsl.
H2 "Patching upstream setup/zpush.sh to install $PHP_XSL_PACKAGE instead of php-xsl"
sed -i "s/php-xsl/$PHP_XSL_PACKAGE/g" setup/zpush.sh
fi
H2 "Run upstream setup"
if ! setup/start.sh; then