Removed broken MYSQL from package

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12679 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/debian/changelog b/gosa-si/debian/changelog
index 87986a718da2e20c063ab6ebe8cdd9688aae0f09..fcef306bc75600435c5306bd65216876ca4e3170 100644 (file)
--- a/gosa-si/debian/changelog
+++ b/gosa-si/debian/changelog
@@ -1,3 +1,9 @@
+gosa-si (1.2-2) etch; urgency=low
+
+  * Removed broken mysql module from package 
+
+ -- Cajus Pollmeier <pollmeier@gonicus.de>  Tue, 14 Oct 2008 09:49:05 +0200
+
 gosa-si (1.2-1) etch; urgency=low
 
   * New upstream version

diff --git a/gosa-si/debian/control b/gosa-si/debian/control
index 93bd2ac502788838c7e16cb4a701ea93fee51609..7730225443defc9062265b9446ad8b81dd4668d3 100644 (file)
--- a/gosa-si/debian/control
+++ b/gosa-si/debian/control
@@ -18,7 +18,7 @@ Description: GOsa support infrastructure
 
 Package: gosa-si-server
 Architecture: any
-Depends: gosa-si-common, libcrypt-smbhash-perl, libdbd-mysql-perl
+Depends: gosa-si-common, libcrypt-smbhash-perl
 Suggests: gosa, gosa-si-server-postfix, gosa-si-server-dak
 Description: GOsa support infrastructure server
  This package provides everything you need in order to deploy a simple

diff --git a/gosa-si/debian/gosa-si-common.install b/gosa-si/debian/gosa-si-common.install
index 98dfc23ba61b51e10adace6478472b41ed7e2804..4fede15d3acb2547daf430e405b3e24de71bbf36 100644 (file)
--- a/gosa-si/debian/gosa-si-common.install
+++ b/gosa-si/debian/gosa-si-common.install
@@ -1,4 +1,3 @@
 modules/GosaSupportDaemon.pm    usr/share/perl5/GOSA
-modules/DBmysql.pm             usr/share/perl5/GOSA
 modules/DBsqlite.pm             usr/share/perl5/GOSA
 modules/ArpWatch.pm            usr/share/perl5/POE/Component

diff --git a/gosa-si/debian/gosa-si-server.config b/gosa-si/debian/gosa-si-server.config
deleted file mode 100644 (file)
index fd90fac..0000000
--- a/gosa-si/debian/gosa-si-server.config
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-set -e
-. /usr/share/debconf/confmodule
-db_capb backup
-db_title "GOsa-SI Database Setup"
-
-STATE=1
-while true; do
-  case "$STATE" in
-    1)
-    db_input medium gosa-si/hostname || true
-    ;;
-    2)
-    db_input medium gosa-si/database || true
-    ;;
-    3)
-    db_input high gosa-si/username || true
-    ;;
-    4)
-    db_input high gosa-si/password || true
-    ;;
-    5)
-    db_input critical gosa-si/rootpw || true
-    ;;
-    *)
-    # The default case catches when $STATE is greater than the
-    # last implemented state, and breaks out of the loop. This
-    # requires that states be numbered consecutively from 1
-    # with no gaps, as the default case will also be entered
-    # if there is a break in the numbering
-    break # exits the enclosing "while" loop      ;;
-  esac
-
-  if db_go; then
-    STATE=$(($STATE + 1))
-  else
-    STATE=$(($STATE - 1))
-  fi
-done
-
-if [ $STATE -eq 1 ]; then
-  # The user has asked to back up from the first
-  # question. This case is problematical. Regular
-  # dpkg and apt package installation isn’t capable
-  # of backing up questions between packages as this
-  # is written, so this will exit leaving the package
-  # unconfigured - probably the best way to handle
-  # the situation.
-  exit 10
-fi

diff --git a/gosa-si/debian/gosa-si-server.postinst b/gosa-si/debian/gosa-si-server.postinst
index 0affbd763ac59466e61909cc6f5dbd4dc3a13203..ccbf8c3c942fbdc3ea6d21b613cc3dfea3f7f66e 100644 (file)
--- a/gosa-si/debian/gosa-si-server.postinst
+++ b/gosa-si/debian/gosa-si-server.postinst
@@ -1,18 +1,5 @@
 #!/bin/sh
 
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-for i in hostname database username password rootpw; do
-         db_get gosa-si/$i || true
-               eval $i'="$RET"'
-done
-
-host="127.0.0.1"
-
 #DEBHELPER#
 
 # We exit unless the package is being configured
@@ -24,26 +11,10 @@ case "$1" in
         *)                     exit 0;
 esac
 
-# Setup database
-/usr/bin/mysqladmin -u root --password=$rootpw create "$database" &> /dev/null || true
-/usr/bin/mysql -u root --password=$rootpw -e "GRANT ALL PRIVILEGES ON $database.* to '$username'@'127.0.0.1' identified by '$password'"
-
 # Fix permission
 [ -f /etc/gosa-si/server.conf ] && chmod go-rwx /etc/gosa-si/server.conf
 
-# Apply DB settings to config file
-if [ -w /etc/gosa-si/server.conf ]; then
-  for i in database username password host; do
-    eval 'val=$'$i
-    grep -E "mysql-$i" /etc/gosa-si/server.conf | grep -vE '^ *#' &> /dev/null && sed -i "/\[server\]/,/\[/s/mysql-$i\s*=\s*\(.*\)$/mysql-$i = $val/g" /etc/gosa-si/server.conf || sed -i "
-/\[server\]/ a\
-mysql-$i = $val" /etc/gosa-si/server.conf
-  done
-fi
-
 # Restart daemon
 invoke-rc.d gosa-si restart
 
-db_stop
-
 exit 0

diff --git a/gosa-si/debian/gosa-si-server.templates b/gosa-si/debian/gosa-si-server.templates
deleted file mode 100644 (file)
index 1195243..0000000
--- a/gosa-si/debian/gosa-si-server.templates
+++ /dev/null
@@ -1,28 +0,0 @@
-Template: gosa-si/hostname
-Type: string
-Default: 127.0.0.1
-Description: Hostname or IP of the MySQL-Server
- Please enter the full-qualified hostname or IP Address of the desired MySQL Host.
-
-Template: gosa-si/database
-Type: string
-Default: gosa_si
-Description: Name of the GOsa-SI Database
- Please choose a name for the gosa-si database.
-
-Template: gosa-si/username
-Type: string
-Default: gosa_si
-Description: Name of the GOsa-SI Database User
- Please choose a name for the gosa-si database user.
-
-Template: gosa-si/password
-Type: password
-Description: Password for the GOsa-SI Database User
- Please enter a password for the gosa-si database user.
-
-Template: gosa-si/rootpw
-Type: password
-Description: Password for the Database Administrator 'root'
- In order to create the privileged account, setup needs the password of the
- database administrator. Please enter the password of the database user 'root'.

diff --git a/gosa-si/debian/rules b/gosa-si/debian/rules
index 3c955e0e442dc5464bdf87c105b684485f3fb6aa..892de833cbcea10e684d584719876dd7e1926dcd 100755 (executable)
--- a/gosa-si/debian/rules
+++ b/gosa-si/debian/rules
@@ -2,7 +2,7 @@
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 build: patch 
        #********************************************************
@@ -37,7 +37,7 @@ install-stamp:
        done
        -find debian/tmp -name '*.svn' -type d -exec rm -rf {} \; 2> /dev/null
 
-       -for i in gosa-si-client gosa-si-server modules/GosaPackages.pm modules/ClientPackages.pm modules/ServerPackages.pm server/events/*; do sed -i 's/use GosaSupportDaemon;/use GOSA::GosaSupportDaemon;/g;s/use DBsqlite;/use GOSA::DBsqlite;/g;s/use DBmysql;/use GOSA::DBmysql;/g' debian/tmp/$$i; done
+       -for i in gosa-si-client gosa-si-server modules/GosaPackages.pm modules/ClientPackages.pm modules/ServerPackages.pm server/events/*; do sed -i 's/use GosaSupportDaemon;/use GOSA::GosaSupportDaemon;/g;s/use DBsqlite;/use GOSA::DBsqlite;/g' debian/tmp/$$i; done
 
        -sed -i 's!"/etc/gosa-si/modules";!use lib "/usr/lib/gosa-si/modules";!g' debian/tmp/gosa-si-server
 
@@ -65,7 +65,7 @@ binary-indep: install
        dh_installchangelogs
        dh_installman
        dh_installlogrotate
-       dh_installdebconf
+       #dh_installdebconf
        dh_installinit --init-script=gosa-si -- start 00 2 3 4 5 . stop 29 1 .
 
        chmod 640 debian/gosa-si-server/etc/gosa-si/server.conf debian/gosa-si-client/etc/gosa-si/client.conf