Removed workaround for apache/php circular depends.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index 63557fe..f98489a 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -470,13 +470,8 @@ upgrade_apache () {
   #pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn
 
   pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert
-  apt-get install -y -d apache2-cn php4-cn
-  apt-get autoclean
-  dpkg -i --ignore-depends=apache2-cn \
-     /var/cache/apt/archives/apache2-cn_* \
-     /var/cache/apt/archives/php4-cn_*
-
-  pkgadd aosi-aai aosi-www-aai # squirrelmail-cn
+  pkgadd apache2-cn php4-cn
+  pkgadd aosi-aai aosi-www-aai squirrelmail-cn
 }
 
 upgrade_amavis () {
@@ -496,7 +491,9 @@ upgrade_amavis () {
 
   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
@@ -508,25 +505,6 @@ upgrade_openldap () {
   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
-  # pkgrm ntp-server
-  pkgadd ntp-cn
-}
-
 # instaliraj zadnji freeradius; uvjeti u queue fileovima
 install_freeradius () {
   pkgadd --force-yes freeradius-cn freeradius=1.0.5-0 freeradius-ldap=1.0.5-0