projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release version 6.0.1.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
27fa13d
..
f690377
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-733,6
+733,10
@@
restore_configs () {
restore_file /etc/issue.net
fi
restore_file /etc/issue.net
fi
+ if pkg slapd lt 2.4.23-7.2; then
+ restore_file /etc/default/slapd
+ fi
+
# dovecot won't start with these options
if pkg dovecot-cn && pkg dovecot-common lt 1:1.2.15-7; then
sed -i 's/^\( *\)\(sieve\(_storage\)\?=.*\)/\1#\2/' \
# dovecot won't start with these options
if pkg dovecot-cn && pkg dovecot-common lt 1:1.2.15-7; then
sed -i 's/^\( *\)\(sieve\(_storage\)\?=.*\)/\1#\2/' \
@@
-823,9
+827,19
@@
disable_monit () {
apt-get remove --yes monit
# stop the binary
pkill -9 monit || true
apt-get remove --yes monit
# stop the binary
pkill -9 monit || true
+ # move away init for insserv to work
+ mv /etc/init.d/monit /var/lib/carnet-upgrade/
fi
}
fi
}
+# allow monit to run again
+enable_monit () {
+ if [ -f /var/lib/carnet-upgrade/monit ]; then
+ mv /var/lib/carnet-upgrade/monit /etc/init.d/monit
+ pkgadd monit-cn
+ fi
+}
+
# check which of the given packages are installed
grep_installed () {
local package installed
# check which of the given packages are installed
grep_installed () {
local package installed
@@
-852,7
+866,7
@@
pkgupgrade () {
# make a silent upgrade to new libc6
upgrade_libc () {
# make a silent upgrade to new libc6
upgrade_libc () {
- DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata udev
+ DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
}
# upgrade apache2/php5
}
# upgrade apache2/php5
@@
-883,17
+897,20
@@
upgrade_amavis () {
upgrade_freeradius () {
pkg freeradius-aai lt 2.1.10-1 || return 0
upgrade_freeradius () {
pkg freeradius-aai lt 2.1.10-1 || return 0
- # aai team prevents a clean upgrade
+ # aai team prevents a normal upgrade
cp -av /etc/freeradius /etc/freeradius.$backup_ext
pkgrm freeradius-aai freeradius-ldap freeradius
cp -av /etc/freeradius /etc/freeradius.$backup_ext
pkgrm freeradius-aai freeradius-ldap freeradius
+ rm -rf /etc/freeradius/certs
pkgadd freeradius-aai
}
pkgadd freeradius-aai
}
-# handle openldap upgrade
-upgrade_openldap () {
- # aai does not depend on the new openldap version
- pkgadd slapd
- pkgadd openldap-aai
+# handle mysql 5.0 to 5.1 upgrade
+upgrade_mysql () {
+ if pkg mysql-server || pkg mysql-server-5.0; then
+ pkgadd mysql-server
+ dpkg -P mysql-server-5.0
+ /etc/init.d/mysql restart
+ fi
}
# fix postgresql deinstallation during upgrade
}
# fix postgresql deinstallation during upgrade
@@
-934,6
+951,12
@@
get_variable () {
upgrade_munin () {
local config backup hostname domain
upgrade_munin () {
local config backup hostname domain
+ # new htmldir location
+ if [ -d /var/www/munin -a ! -e /var/cache/munin/www ]; then
+ mkdir -p /var/cache/munin
+ mv /var/www/munin /var/cache/munin/www
+ fi
+
for pkg_name in munin munin-node; do
pkg $pkg_name lt '1.4.5-3' || continue
for pkg_name in munin munin-node; do
pkg $pkg_name lt '1.4.5-3' || continue