From: Valentin Vidic <vvidic@carnet.hr>
Date: Fri, 11 Jan 2008 14:51:22 +0000 (+0100)
Subject: Move apache and munin earlier in the action queue.
X-Git-Tag: debian/4.0.1~75
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=9e36e452578e07ffff1fa54f0eb7f4fb023e3214;p=carnet-upgrade.git

Move apache and munin earlier in the action queue.
Remove special handling for ntp-cn.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 53edf3e..c0a1e73 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -28,13 +28,12 @@ true				upgrade_libc
 true				install_keyrings
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+pkg mrtg-cn			pkgadd munin-cn
 pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
 # konacno, instalacija novih paketa
 pkg amavisd-cn			upgrade_amavis
-pkg openldap-aai		upgrade_openldap
 pkg apache-cn			upgrade_apache
-pkg mrtg-cn			pkgadd munin-cn
-pkg ntp-cn			upgrade_ntp
+pkg openldap-aai		upgrade_openldap
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 pkg freeradius-cn lt 2:1.0.1-2	install_freeradius	# neki su totalno poremeceni # fix 2.1.4
diff --git a/src/data.sh b/src/data.sh
index 08dbdba..f7a1739 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -54,7 +54,7 @@ openldap-aai
 freeradius-aai freeradius
 aosi-aai
 aosi-www-aai
-ntp-cn ntp
+ntp-cn
 vsftpd-cn vsftpd
 xinetd-cn xinetd	
 monit-cn
diff --git a/src/functions.sh b/src/functions.sh
index dd8db6f..87d0e92 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -510,13 +510,6 @@ upgrade_openldap () {
   dpkg --configure -a # try postinst again
 }
 
-# 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