X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=43d8be96dc0db5a300eab4def0d943db0b2e5257;hb=0030fa4a7f1ebde7b42bf97fe7071b40f73bd10f;hp=dd8db6fc8c49bd2a2b7af909870f3c53d2b5141b;hpb=8f3ffce4b9a0228d46309643aa64f1053522b592;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index dd8db6f..43d8be9 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -304,7 +304,7 @@ upgrade () {
 
 # funkcija utrpa ispravan sources.list
 create_sources_list () {
-    [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn3-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn3-upgrade
+    [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn4-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn4-upgrade
     cp /usr/share/carnet-upgrade/files/etc/apt/sources.list /etc/apt
     notice "Novi sadrzaj datoteke /etc/apt/sources.list:
 
@@ -323,18 +323,23 @@ remove_group_proc () {
 
 add_group_proc () {
   if ! getent group proc > /dev/null; then
+    # grsec uses gid 99 for /proc files
     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 ]; then
+	check_and_sed '^OIDENT_GROUP=proc' \
+                      's/^\(OIDENT_GROUP\)=.*/\1=proc/' \
+                      /etc/default/oidentd \
+        && /etc/init.d/oidentd restart
     fi
   fi
 }
 
 # backup_slapd_db
 backup_slapd_db () {
-  local ldap_backup=/var/backups/slapcat.cn3-upgrade
+  local ldap_backup=/var/backups/slapcat.cn4-upgrade
 
   if [ ! -f $ldap_backup ]; then
     [ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius stop || true
@@ -357,7 +362,7 @@ backup_slapd_db () {
 
 # backup etc direktorija
 backup_etc_dir () {
-  local etc_backup=/var/backups/etc.cn3-upgrade.tar.gz
+  local etc_backup=/var/backups/etc.cn4-upgrade.tar.gz
 
   if [ ! -f $etc_backup ]; then
     if tar cfz $etc_backup /etc 2> /dev/null; then
@@ -373,15 +378,15 @@ backup_etc_dir () {
 # fixaj /etc/default/raid2
 fix_etc_default_raid2 () {
   if [ -f /etc/default/raid2 ]; then
-    sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.cn3-upgrade.$$
-    chown --reference=/etc/default/raid2 /etc/default/raid2.cn3-upgrade.$$
-    chmod --reference=/etc/default/raid2 /etc/default/raid2.cn3-upgrade.$$
+    sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.cn4-upgrade.$$
+    chown --reference=/etc/default/raid2 /etc/default/raid2.cn4-upgrade.$$
+    chmod --reference=/etc/default/raid2 /etc/default/raid2.cn4-upgrade.$$
 
-    if ! cmp -s /etc/default/raid2.cn3-upgrade.$$ /etc/default/raid2; then
+    if ! cmp -s /etc/default/raid2.cn4-upgrade.$$ /etc/default/raid2; then
       log "Fixed /etc/default/raid2 AUTOSTART option."
-      mv /etc/default/raid2.cn3-upgrade.$$ /etc/default/raid2
+      mv /etc/default/raid2.cn4-upgrade.$$ /etc/default/raid2
     else
-      rm /etc/default/raid2.cn3-upgrade.$$
+      rm /etc/default/raid2.cn4-upgrade.$$
     fi
   fi
 }
@@ -391,7 +396,7 @@ restore_config () {
   local file file_backup
 
   for file in "$@"; do
-    file_backup=$file.cn3-upgrade
+    file_backup=$file.cn4-upgrade
     if [ -e $file -a ! -e $file_backup ]; then
       # backup file
       mv $file $file_backup
@@ -436,7 +441,7 @@ restore_configs () {
 
   # aide switched to ucf, move old configs aside
   for file in /etc/aide/aide.conf /etc/cron.daily/aide /etc/default/aide; do
-      [ ! -e "$file.cn3-upgrade" ] && mv "$file" "$file.cn3-upgrade"
+      [ ! -e "$file.cn4-upgrade" ] && mv "$file" "$file.cn4-upgrade"
       rm -f "$file"
   done
 }
@@ -457,30 +462,28 @@ upgrade_libc () {
 
 # upgrade apache -> apache2
 upgrade_apache () {
+
   # bugfix for apache2-cn postinst
   mkdir -p /etc/apache2
   touch /etc/apache2/httpd.conf
 
-  pkgadd php4-odbc php4-xslt
-
-  # apache2 conflicts with these
-  pkgrm apache aosi-aai aosi-www-aai php4-cn squirrelmail-cn
-
-  # apache2-cn postinst needs new mktemp
-  #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_*
+  # temporary remove packages conflicting with apache2
+  delpkg=""
+  for p in aosi-aai aosi-www-aai \
+           php4-cn php4-odbc php4-xslt \
+           squirrelmail-cn; do
+     pkg p && delpkg="$delpkg $p"
+  done
+  eval pkgrm apache $delpkg
 
-  pkgadd aosi-aai aosi-www-aai # squirrelmail-cn
+  # install new packages
+  eval pkgadd apache2-cn apache2-mpm-prefork \
+              php4-cn libapache2-mod-php4 \
+              $delpkg
 }
 
 upgrade_amavis () {
-  # remove diversion
+  # remove init script diversion
   if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
     rm -f /etc/init.d/amavis
     dpkg-divert --quiet --remove /etc/init.d/amavis
@@ -488,16 +491,19 @@ upgrade_amavis () {
 
   # move old config aside
   local conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.cn3-upgrade ]; then
-    mv $conf $conf.cn3-upgrade
+  if [ -e $conf -a ! -e $conf.cn4-upgrade ]; then
+    mv $conf $conf.cn4-upgrade
   fi
 
+  # install new packages
   pkgadd amavisd-cn amavisd-new
 
+  # fix new packages
   check_and_sed '^clamd.*5.clamav.log$' \
                 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
                 /etc/init.d/amavisd-cn || true
 
+  # start new packages
   /etc/init.d/amavis restart
 }
 
@@ -510,45 +516,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
-}
-
-# tentatively remove obsolete option in xinetd.conf
-fix_xinetd_conf () {
-  if [ -f /etc/xinetd.conf ]; then
-    check_and_sed 'log_on_failure.*RECORD' \
-                   's/\(log_on_failure.*\)RECORD/\1/g' \
-                   /etc/xinetd.conf || true
-  fi
-}
-
-# temporarily disable mod_ssl.conf in apache so that upgrade works
-fix_mod_ssl_include() {
-  if [ -f /etc/apache/mod_ssl.conf ]; then
-    check_and_sed '^Include /etc/apache/mod_ssl\.conf' \
-                  's,\(^Include[ 	][ 	]*/etc/apache/mod_ssl\.conf\),#\1,' \
-                  /etc/apache/httpd.conf || true
-  fi
-}
-
-fix_proftpd_conf() {
-  if [ -f /etc/proftpd.conf ]; then
-    check_and_sed '^LsDefaultOptions' \
-                  's,^LsDefaultOptions,ListOptions,' \
-                  /etc/proftpd.conf || true
-  fi
-  [ -x /etc/init.d/proftpd ] && /etc/init.d/proftpd restart || true
-}
-
 # fix /etc/dpkg/dpkg.cfg
 comment_force_overwrite () {
   if [ -f /etc/dpkg/dpkg.cfg ]; then
@@ -560,21 +527,13 @@ comment_force_overwrite () {
   fi
 }
 
-fix_aidexfer_conf() {
-  if [ -f /etc/aide/aidexfer.conf ]; then
-    check_and_sed '/usr/local/lib/aidexfer' \
-                  's,/usr/local/lib/aidexfer,/usr/share/aidexfer,' \
-                  /etc/aide/aidexfer.conf || true
-  fi
-}
-
 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
 }
 
@@ -587,79 +546,3 @@ check_disk_space() {
     exit 1
   fi
 }
-
-fix_webalizer_conf () {
-  if [ -f /etc/webalizer.conf ]; then
-    check_and_sed '^/' \
-                  's,^/,#,' \
-                  /etc/webalizer.conf || true
-  fi
-}
-
-# like in sendmail-cn
-fix_smtp_auth() {
-  local tmpl conf tmpldir confdir mv_in_sasl
-
-  # all of these should be installed after dist-upgrade
-  # if we had SMTP AUTH previously
-  if pkg sasl2-bin && pkg sasl-bin && pkg sendmail-cn ge 2:8.13.1-2; then
-    :
-  else
-    return 0
-  fi
-
-  tmpldir=/usr/share/sendmail/examples/sasl
-  tmpl=$tmpldir/Sendmail.conf.2
-  confdir=/etc/mail/sasl
-  conf=$confdir/Sendmail.conf.2
-  if [ "$(sasldblistusers | wc -l)" -gt 0 ]; then
-    if [ "$(sasldblistusers2 | wc -l)" -eq 0 ]; then
-      echo | sasldbconverter2 /etc/sasldb
-      log "Converted /etc/sasldb to /etc/sasldb2."
-    else
-      log "Found users in both /etc/sasldb and /etc/sasldb2, doing nothing!"
-    fi
-  fi
-  if [ -f $conf -a -f $tmpl ] && \
-    ! cmp -s $conf $tmpl; then
-    mv $conf $conf.cn3-upgrade
-    mv_in_sasl=1
-  fi
-  if [ -f $confdir/Sendmail.conf ]; then
-    mv $confdir/Sendmail.conf $confdir/Sendmail.conf.cn3-upgrade
-    mv_in_sasl=1
-  fi
-  if [ -f $confdir/sasl.m4 ] && \
-    ! cmp -s $confdir/sasl.m4 $tmpldir/sasl.m4; then
-    mv -f $confdir/sasl.m4 $confdir/sasl.m4.cn3-upgrade
-    mv_in_sasl=1
-  fi
-  [ "$mv_in_sasl" ] && \
-    log "Renamed old files in $confdir."
-
-  # Regenerate sasl.m4 and friends.
-  /usr/share/sendmail/update_auth | egrep '^(Created template)' || true
-
-  # Hope noone else uses this file. (see doc/sendmail/README.Debian.gz)
-  dpkg-statoverride --remove /etc/sasldb2
-  dpkg-statoverride --update --add smmta smmsp 660 /etc/sasldb2
-  # needed for PLAIN, LOGIN
-  dpkg-statoverride --remove /var/run/saslauthd
-  dpkg-statoverride --update --add root sasl 711 /var/run/saslauthd
-
-  # Enable saslauthd, used by default Debian config
-  if ! egrep -q '^START=yes' /etc/default/saslauthd; then
-    check_and_sed START 's/#\ +START=yes$/START=yes/' /etc/default/saslauthd
-    /etc/init.d/saslauthd restart
-  fi
-
-  /etc/init.d/sendmail reload || true
-}
-
-sources_list() {
-  if [ ! -e /var/lib/carnet-upgrade/stamp-sources_list ]; then
-    install-carnet-sources.list
-    apt-get -y update
-    touch /var/lib/carnet-upgrade/stamp-sources_list
-  fi
-}