From: Valentin Vidic <vvidic@carnet.hr>
Date: Mon, 14 Jan 2008 14:24:51 +0000 (+0100)
Subject: Remove unused actions. Use new version in motd.
X-Git-Tag: debian/4.0.1~71
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=44ca3c64e35e1753189d1b17266371b7327f338f;p=carnet-upgrade.git

Remove unused actions. Use new version in motd.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index c0a1e73..c183379 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -7,8 +7,6 @@ true				remove_bloat
 true				comment_force_overwrite	# ruzna opcija za dpkg
 pkg libpam-skey			pkgrm libpam-skey
 pkg skey-cn			pkgrm skey-cn
-#pkg getunix			pkgrm getunix		# obsolete
-#pkg getunix-cn			pkgrm getunix-cn
 true				fix_xinetd_conf		# ima i post-upgrade provjeru
 #pkg uw-imapd-ssl-cn		post_upgrade pkgrm uw-imapd-ssl
 pkg lynx-ssl-cn			post_upgrade pkgadd lynx-cn
@@ -26,17 +24,17 @@ true				check_disk_space
 ! debconf_priority check	debconf_priority set	# utisaj debconf
 true				upgrade_libc
 true				install_keyrings
+pkg mrtg-cn			post_upgrade pkgadd munin-cn
+pkg mrtg-cn			pkgrm mrtg mrtg-cn	# zamjenjeno sa munin
+pkg postgrey			pkgrm postgrey		# problematican
 # 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 apache-cn			upgrade_apache
 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
 true				dist_upgrade
 true				pkgadd apt-listchanges deborphan
 # i ostatak
diff --git a/src/data.sh b/src/data.sh
index f7a1739..6c814de 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -97,7 +97,6 @@ ntp-cn			ntp		/usr/sbin/ntpd				ntpd
 oidentd-cn		oident		/usr/sbin/oidentd			oidentd
 openldap-aai		openldap	/usr/sbin/slapd				OpenLDAP
 openssh-cn		root		/usr/sbin/sshd				OpenSSH
-postfix-cn		postgrey	/usr/sbin/postgrey			Postfix greylisting
 postfix-cn		root		/usr/lib/postfix/master			Postfix
 postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
 postgresql-cn		postgres	/usr/lib/postgresql/bin/postmaster	PostgreSQL
diff --git a/src/functions.sh b/src/functions.sh
index 9a89122..ac21431 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -325,9 +325,11 @@ add_group_proc () {
   if ! getent group proc > /dev/null; then
     groupadd -g 99 proc 
     log "groupadd -g 99 proc"
-    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ] && \
-       egrep -q 'OIDENT_GROUP.*proc' /etc/default/oidentd; then
-      /etc/init.d/oidentd restart || true
+
+    # update oidentd so it uses the proc group
+    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ];
+	check_and_sed 'OIDENT_GROUP.*proc' 's/\(OIDENT_GROUP\).*/\1=proc/' \
+            /etc/default/oident && /etc/init.d/oidentd restart
     fi
   fi
 }
@@ -505,11 +507,6 @@ upgrade_openldap () {
   dpkg --configure -a # try postinst again
 }
 
-# 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
-}
-
 # tentatively remove obsolete option in xinetd.conf
 fix_xinetd_conf () {
   if [ -f /etc/xinetd.conf ]; then
@@ -558,11 +555,11 @@ fix_aidexfer_conf() {
 
 fix_issue () {
   cat > /etc/issue <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 3.0) \\n \\l
+Debian GNU/Linux 4.0 (CARNet Debian 4.0) \\n \\l
 EOF
 
   cat > /etc/issue.net <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 3.0) %h
+Debian GNU/Linux 4.0 (CARNet Debian 4.0) %h
 EOF
 }