projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed postfix and dovecot upgrade functions.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
63557fe
..
dd8db6f
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-496,7
+496,9
@@
upgrade_amavis () {
check_and_sed '^clamd.*5.clamav.log$' \
's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
check_and_sed '^clamd.*5.clamav.log$' \
's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
- /etc/inet.d/amavisd-cn || true
+ /etc/init.d/amavisd-cn || true
+
+ /etc/init.d/amavis restart
}
# fix openldap-aai postinst user handling
}
# fix openldap-aai postinst user handling
@@
-508,18
+510,6
@@
upgrade_openldap () {
dpkg --configure -a # try postinst again
}
dpkg --configure -a # try postinst again
}
-# workaround postfix-cn dependencies
-upgrade_postfix () {
- pkgadd sasl2-bin
- pkgadd postfix postfix-cn
-}
-
-# workaround dovecot-cn dependencies
-upgrade_dovecot () {
- pkgadd dovecot-imapd dovecot-pop3d
- pkgadd dovecot-cn
-}
-
# workaround ntp-cn dependencies
upgrade_ntp () {
pkgadd ntp ntpdate
# workaround ntp-cn dependencies
upgrade_ntp () {
pkgadd ntp ntpdate