mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2024-11-22 02:17:26 +00:00
remove some cleanup steps that are no longer needed since we aren't supporting upgrades of existing machines and, even if we did, we aren't supporting upgrades from really old versions of Mail-in-a-Box
This commit is contained in:
parent
51972fd129
commit
f6a641ad23
@ -87,7 +87,6 @@ rm -f /tmp/bootstrap.zip
|
|||||||
|
|
||||||
# Create an init script to start the management daemon and keep it
|
# Create an init script to start the management daemon and keep it
|
||||||
# running after a reboot.
|
# running after a reboot.
|
||||||
rm -f /usr/local/bin/mailinabox-daemon /etc/init.d/mailinabox # old paths
|
|
||||||
cat > $inst_dir/start <<EOF;
|
cat > $inst_dir/start <<EOF;
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
source $venv/bin/activate
|
source $venv/bin/activate
|
||||||
@ -98,10 +97,6 @@ hide_output systemctl link conf/mailinabox.service
|
|||||||
hide_output systemctl daemon-reload
|
hide_output systemctl daemon-reload
|
||||||
hide_output systemctl enable mailinabox.service
|
hide_output systemctl enable mailinabox.service
|
||||||
|
|
||||||
# Remove old files we no longer use.
|
|
||||||
rm -f /etc/cron.daily/mailinabox-backup
|
|
||||||
rm -f /etc/cron.daily/mailinabox-statuschecks
|
|
||||||
|
|
||||||
# Perform nightly tasks at 3am in system time: take a backup, run
|
# Perform nightly tasks at 3am in system time: take a backup, run
|
||||||
# status checks and email the administrator any changes.
|
# status checks and email the administrator any changes.
|
||||||
|
|
||||||
|
15
setup/web.sh
15
setup/web.sh
@ -94,21 +94,6 @@ if [ ! -f $STORAGE_ROOT/www/default/index.html ]; then
|
|||||||
fi
|
fi
|
||||||
chown -R $STORAGE_USER $STORAGE_ROOT/www
|
chown -R $STORAGE_USER $STORAGE_ROOT/www
|
||||||
|
|
||||||
# We previously installed a custom init script to start the PHP FastCGI daemon. #NODOC
|
|
||||||
# Remove it now that we're using php5-fpm. #NODOC
|
|
||||||
if [ -L /etc/init.d/php-fastcgi ]; then
|
|
||||||
echo "Removing /etc/init.d/php-fastcgi, php5-cgi..." #NODOC
|
|
||||||
rm -f /etc/init.d/php-fastcgi #NODOC
|
|
||||||
hide_output update-rc.d php-fastcgi remove #NODOC
|
|
||||||
apt-get -y purge php5-cgi #NODOC
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove obsoleted scripts. #NODOC
|
|
||||||
# exchange-autodiscover is now handled by Z-Push. #NODOC
|
|
||||||
for f in webfinger exchange-autodiscover; do #NODOC
|
|
||||||
rm -f /usr/local/bin/mailinabox-$f.php #NODOC
|
|
||||||
done #NODOC
|
|
||||||
|
|
||||||
# Start services.
|
# Start services.
|
||||||
restart_service nginx
|
restart_service nginx
|
||||||
restart_service php7.0-fpm
|
restart_service php7.0-fpm
|
||||||
|
@ -25,11 +25,6 @@ apt_install \
|
|||||||
php7.0-cli php7.0-sqlite php7.0-mcrypt php7.0-intl php7.0-json php7.0-common php7.0-curl \
|
php7.0-cli php7.0-sqlite php7.0-mcrypt php7.0-intl php7.0-json php7.0-common php7.0-curl \
|
||||||
php7.0-gd php7.0-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 php7.0-mbstring
|
php7.0-gd php7.0-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 php7.0-mbstring
|
||||||
|
|
||||||
# We used to install Roundcube from Ubuntu, without triggering the dependencies #NODOC
|
|
||||||
# on Apache and MySQL, by downloading the debs and installing them manually. #NODOC
|
|
||||||
# Now that we're beyond that, get rid of those debs before installing from source. #NODOC
|
|
||||||
apt-get purge -qq -y roundcube* #NODOC
|
|
||||||
|
|
||||||
# Install Roundcube from source if it is not already present or if it is out of date.
|
# Install Roundcube from source if it is not already present or if it is out of date.
|
||||||
# Combine the Roundcube version number with the commit hash of plugins to track
|
# Combine the Roundcube version number with the commit hash of plugins to track
|
||||||
# whether we have the latest version of everything.
|
# whether we have the latest version of everything.
|
||||||
|
Loading…
Reference in New Issue
Block a user