mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2024-12-25 07:47:05 +00:00
merge from master
This commit is contained in:
commit
8f4860bc1c
@ -1,6 +1,11 @@
|
||||
CHANGELOG
|
||||
=========
|
||||
|
||||
v0.53a (May 8, 2021)
|
||||
--------------------
|
||||
|
||||
The download URL for Z-Push has been revised becaue the old URL stopped working.
|
||||
|
||||
v0.53 (April 12, 2021)
|
||||
----------------------
|
||||
|
||||
|
@ -99,7 +99,7 @@ Clone this repository and checkout the tag corresponding to the most recent rele
|
||||
|
||||
$ git clone https://github.com/mail-in-a-box/mailinabox
|
||||
$ cd mailinabox
|
||||
$ git checkout v0.53
|
||||
$ git checkout v0.53a
|
||||
|
||||
Begin the installation.
|
||||
|
||||
|
@ -26,16 +26,21 @@ cat > /root/.forward << EOF;
|
||||
administrator@$PRIMARY_HOSTNAME
|
||||
EOF
|
||||
|
||||
# Adapt rkhunter cron job to reduce log file production
|
||||
sed -i "s/--cronjob --report-warnings-only --appendlog/--cronjob --report-warnings-only --no-verbose-logging --appendlog/g" /etc/cron.daily/rkhunter
|
||||
|
||||
# Install fake mail script
|
||||
if [ ! -f /usr/local/bin/mail ]; then
|
||||
hide_output install -m 755 tools/fake_mail /usr/local/bin
|
||||
mv -f /usr/local/bin/fake_mail /usr/local/bin/mail
|
||||
fi
|
||||
|
||||
# Adapt rkhunter configuration
|
||||
tools/editconf.py /etc/rkhunter.conf \
|
||||
UPDATE_MIRRORS=1 \
|
||||
MIRRORS_MODE=0 \
|
||||
WEB_CMD='""' \
|
||||
APPEND_LOG=1 \
|
||||
ALLOWHIDDENDIR=/etc/.java
|
||||
|
||||
# Check presence of whitelist
|
||||
|
@ -24,7 +24,7 @@ if [ -z "$TAG" ]; then
|
||||
|
||||
elif [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/18\.04\.[0-9]/18.04/' `" == "Ubuntu 18.04 LTS" ]; then
|
||||
# This machine is running Ubuntu 18.04.
|
||||
TAG=v0.53
|
||||
TAG=v0.53a
|
||||
|
||||
elif [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' `" == "Ubuntu 14.04 LTS" ]; then
|
||||
# This machine is running Ubuntu 14.04.
|
||||
|
@ -23,7 +23,7 @@ phpenmod -v php imap
|
||||
|
||||
# Copy Z-Push into place.
|
||||
VERSION=2.6.2
|
||||
TARGETHASH=4b312d64227ef887b24d9cc8f0ae17519586f6e2
|
||||
TARGETHASH=f0e8091a8030e5b851f5ba1f9f0e1a05b8762d80
|
||||
needs_update=0 #NODOC
|
||||
if [ ! -f /usr/local/lib/z-push/version ]; then
|
||||
needs_update=1 #NODOC
|
||||
@ -33,12 +33,12 @@ elif [[ $VERSION != `cat /usr/local/lib/z-push/version` ]]; then
|
||||
fi
|
||||
if [ $needs_update == 1 ]; then
|
||||
# Download
|
||||
wget_verify "https://stash.z-hub.io/rest/api/latest/projects/ZP/repos/z-push/archive?at=refs%2Ftags%2F$VERSION&format=zip" $TARGETHASH /tmp/z-push.zip
|
||||
wget_verify "https://github.com/Z-Hub/Z-Push/archive/refs/tags/$VERSION.zip" $TARGETHASH /tmp/z-push.zip
|
||||
|
||||
# Extract into place.
|
||||
rm -rf /usr/local/lib/z-push /tmp/z-push
|
||||
unzip -q /tmp/z-push.zip -d /tmp/z-push
|
||||
mv /tmp/z-push/src /usr/local/lib/z-push
|
||||
mv /tmp/z-push/*/src /usr/local/lib/z-push
|
||||
rm -rf /tmp/z-push.zip /tmp/z-push
|
||||
|
||||
rm -f /usr/sbin/z-push-{admin,top}
|
||||
|
Loading…
Reference in New Issue
Block a user