izmjene u install-carnet-debian

diff --git a/debian/changelog b/debian/changelog
index 0c6ff17..e86574d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
+carnet-debian (5.0.1) stable; urgency=medium
+
+  * Izmjene u skripti install-carnet-debian
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 17 Jun 2009 19:48:01 +0200
+
 carnet-debian (5.0.0) stable; urgency=medium
 
   * Prva verzija za lenny
   * Naredbe za baratanje Debconfom prebacene u postinst
+  * Sve je podrazumno ukljuceno (osim proftpd-cn jer postoji vsftpd-cn)
 
  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Tue, 26 May 2009 15:12:18 +0200
 

diff --git a/debian/postinst b/debian/postinst
index 386c10c..9035bf7 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,9 +8,34 @@ set -e
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-db_fset carnet-debian/packages seen false
-db_go || true
-db_input critical carnet-debian/packages || true
+while true; do
+  db_fset carnet-debian/packages seen false
+  db_go || true
+  db_input critical carnet-debian/packages || true
+  db_go || true
+
+  db_get carnet-debian/packages
+  packages="$RET"
+  if echo $packages | grep -q vsftpd-cn; then
+    vsftpd="yes"
+  else
+    vsftpd="no"
+  fi
+
+  if echo $packages | grep -q proftpd-cn; then
+    proftpd="yes"
+  else
+    proftpd="no"
+  fi
+
+  if [ "$proftpd" = "yes" -a "$vsftpd" = "yes" ]; then
+    db_fset carnet-debian/ftpd seen false
+    db_go || true
+    db_input critical carnet-debian/ftpd || true
+  else
+    break
+  fi
+done
 
 db_fset carnet-debian/note seen false
 db_go || true

diff --git a/debian/templates b/debian/templates
index 6ff63bc..6998a18 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -1,6 +1,7 @@
 Template: carnet-debian/packages
 Type: multiselect
 Choices: amavisd-cn, amavis-stats-cn, apache2-cn, apt-cn, bind9-cn, carnet-tools-cn, clamav-cn, dovecot-cn, fail2ban-cn, iptables-cn, jre-cn, kernel-2.6-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php5-cn, php-suhosin-cn, pine-cn, postfix-cn, proftpd-cn, samba-cn, spamassassin-cn, squirrelmail-change-pass-cn, squirrelmail-cn, sysadmin-cn, vsftpd-cn, webalizer-cn, xinetd-cn 
+Default: amavisd-cn, amavis-stats-cn, apache2-cn, apt-cn, bind9-cn, carnet-tools-cn, clamav-cn, dovecot-cn, fail2ban-cn, iptables-cn, jre-cn, kernel-2.6-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php5-cn, php-suhosin-cn, pine-cn, postfix-cn, samba-cn, spamassassin-cn, squirrelmail-change-pass-cn, squirrelmail-cn, sysadmin-cn, vsftpd-cn, webalizer-cn, xinetd-cn 
 Description: Koje pakete zelite?
  CARNet Debian donosi pakete za laksu konfiguraciju servisa na CARNetovom
  cvornom racunalu.
@@ -11,3 +12,9 @@ Description: Instalacija CARNetovih paketa
  CARNetove pakete za Debian mozete instalirati slijedecom naredbom:
  .
  # install-carnet-debian
+
+Template: carnet-debian/ftpd
+Type: note
+Description: ProFTPD vs. vsftpd
+ Odabrali ste oba FTP daemona, morate izabrati samo jedan (ili vsftpd-cn
+ ili proftpd-cn).

diff --git a/install-carnet-debian b/install-carnet-debian
index be124a9..ea85ed9 100644 (file)
--- a/install-carnet-debian
+++ b/install-carnet-debian
@@ -7,5 +7,7 @@ packages="`debconf-show carnet-debian | awk -F: /packages/'{print $2}' | tr -d '
 if [ -z "$packages" ]; then
   echo "CN: No packages for install."
 else
-  apt-get install $packages
+  for package in $packages; do
+    apt-get -y install $package
+  done
 fi