Recommend: php5-pecl-smb and skip interactive install for Univention (uses existing "Administrator" as 1. EGroupware user)

doc/rpm-build/debian.config

@@ -0,0 +1,28 @@
+#! /bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+if grep -q '^DISTRIB_ID="Univention"$' /etc/lsb-release
+then
+	# Univention requires non-interactive install:
+	# mysql credentials are read from their config
+	# admin user is existing "Administrator" with unchanged password
+	# header user is random and gets written to /root/egroupware-epl-install.log
+	:
+else
+	if [ "$1" = configure -o "$1" = upgrade ]
+	then
+		db_input high "egroupware/header/user" || true
+		db_input high "egroupware/header/password" || true
+		db_input high "egroupware/admin/user" || true
+		db_input high "egroupware/admin/password" || true
+		db_input high "egroupware/lang" || true
+		db_input high "egroupware/db_root" || true
+		db_input high "egroupware/db_root_pw" || true
+		db_go
+	fi
+fi
+

doc/rpm-build/debian.control

@@ -9,7 +9,7 @@ Homepage: http://www.stylite.de/EPL
 Package: egroupware-epl
 Architecture: all
 Depends:
- egroupware-epl-core (= ${binary:Version}), 
+ egroupware-epl-core (= ${binary:Version}),
  egroupware-epl-egw-pear (= ${binary:Version}),
  egroupware-epl-jdots (= ${binary:Version}),
  egroupware-epl-pixelegg (= ${binary:Version}),
@@ -59,11 +59,12 @@ Depends: apache2,
  php5-mcrypt,
  php5-xsl,
  ${misc:Depends}
-Recommends: mysql-server, php-apc, php5-tidy, mysql-client | postgresql-client
+Recommends: mysql-server, php-apc, php5-pecl-smb, php5-tidy, mysql-client | postgresql-client
 Suggests: egroupware-epl,
  php5-ldap,
  php5-mhash,
- php5-auth-pam
+ php5-auth-pam,
+ php-log
 Provides: egroupware-epl-addressbook, egroupware-epl-etemplate
 Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate,
  egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupare-epl-phpsysinfo
@@ -190,7 +191,7 @@ Description: web-based groupware suite - importexport application
  .
  This eGroupWare application is a framework for egroupware to handle
  imports and exports.
- 
+
 Package: egroupware-epl-infolog
 Architecture: all
 Depends: egroupware-epl-core (>= ${binary:Version}), ${misc:Depends}
@@ -237,7 +238,7 @@ Description: web-based groupware suite - notifications
  .
  This package contains the EGroupware notifications, provided as an
  EGroupware application.
-    
+
 Package: egroupware-epl-phpbrain
 Architecture: all
 Depends: egroupware-epl-core (>= ${binary:Version}),
@@ -311,7 +312,7 @@ Description: web-based groupware suite - site manager application
 
 Package: egroupware-epl-timesheet
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}), 
+Depends: egroupware-epl-core (>= ${binary:Version}),
  ${misc:Depends}
 Suggests: egroupware-epl-projectmanager
 Conflicts: egroupware-timesheet
@@ -336,7 +337,7 @@ Description: web-based groupware suite - tracker application
 
 Package: egroupware-epl-wiki
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}), 
+Depends: egroupware-epl-core (>= ${binary:Version}),
  ${misc:Depends}
 Conflicts: egroupware-wiki
 Replaces: egroupware-wiki

doc/rpm-build/debian.postinst

@@ -16,81 +16,62 @@ webserver_soft_reload() {
 }
 
 
-
+if [ "$1" = configure -o "$1" = upgrade ]
-
+then
-if [ "$1" = configure -o "$1" = upgrade ]; then
-	#mkdir -p /var/lib/egroupware/files/users
-	#mkdir -p /var/lib/egroupware/files/groups
-	#mkdir -p /var/lib/egroupware/files/db_backup
-	mkdir -p /var/lib/egroupware/sessions
 	mkdir -p /var/lib/egroupware/default/files
 	mkdir -p /var/lib/egroupware/default/backup
 
 	config="/var/lib/egroupware/header.inc.php"
 	template="/usr/share/egroupware/header.inc.php.template"
 
-# We now ask in "./config"
+	install_log="/root/egroupware-epl-install.log"
+	date >> $install_log
 
-		# Get configuration passwords.
+	# If upgrading, $2 contains the release currently installed, otherwise it's empty
-		db_get "egroupware/header/user"
+	if [ "$2" ]
-		header_user="$RET"
+	then
-		db_get "egroupware/header/password"
+		/usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log
-		header_password="$RET"
+	else
-
+		if grep -q '^DISTRIB_ID="Univention"$' /etc/lsb-release
-		# Get first egroupware user / pw
+		then
-		db_get "egroupware/admin/user"
+			/usr/share/egroupware/doc/rpm-build/post_install.php \
-		admin_user="$RET"
+				--admin_user "Administrator" \
-		db_get "egroupware/admin/password"
+				--admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log
-		admin_password="$RET"
-
-		# Get egroupware language
-		db_get "egroupware/lang"
-		lang="$RET"
-
-		# Get mysql root / pw
-		db_get "egroupware/db_root"
-		db_root="$RET"
-		db_get "egroupware/db_root_pw"
-		db_root_pw="$RET"
-
-		install_log="/root/egroupware-epl-install.log"
-		date >> $install_log
-
-		#if [ "x$header_password" == "x" -a "x$admin_password" == "x" -a "x$db_root_pw" ]
-		# If upgrading, $2 contains the release currently installed, otherwise it's empty
-		if [ "$2" ]; then 
-			/usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log
 		else
-		/usr/share/egroupware/doc/rpm-build/post_install.php \
+			# Get configuration passwords
-			--config_user "$header_user" \
+			db_get "egroupware/header/user"
-			--config_passwd "$header_password" \
+			header_user="$RET"
-			--admin_user "$admin_user" \
+			db_get "egroupware/header/password"
-			--admin_passwd "$admin_password" \
+			header_password="$RET"
-			--lang "$lang" \
-			--db_type mysql \
-			--db_root "$db_root" \
-			--db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log
-		fi
-		echo "EGroupware install log saved to $install_log"
 
-		# Build egroupware header manager configuration file.
+			# Get first egroupware user / pw
-		#perl -MDigest::MD5 -0777 -p -e "
+			db_get "egroupware/admin/user"
-		#	s/<!-- BEGIN domain -->.*<!-- END domain -->//s;
+			admin_user="$RET"
-		#	s/{domains}//;
+			db_get "egroupware/admin/password"
-		#	s#{SERVER_ROOT}#/usr/share/egroupware#;
+			admin_password="$RET"
-		#	s#{INCLUDE_ROOT}#/usr/share/egroupware#;
+
-		#	s/{SETUP_ACL}//;
+			# Get egroupware language
-		#	s/{DOMAIN_SELECTBOX}/false/;
+			db_get "egroupware/lang"
-		#	s/{DB_PERSISTENT}/false/;
+			lang="$RET"
-		#	s/{SESSIONS_TYPE}/db/;
+
-		#	s/{ENABLE_MCRYPT}/false/;
+			# Get mysql root / pw
-		#	s/{MCRYPT_VERSION}/none/;
+			db_get "egroupware/db_root"
-		#	s/{MCRYPT_IV}/none/;
+			db_root="$RET"
-		#	s/{HEADER_ADMIN_PASSWORD}/Digest::MD5::md5_hex('$header_password')/e;
+			db_get "egroupware/db_root_pw"
-		#	# put this at the end in case someone picks a user name that matches a placeholder
+			db_root_pw="$RET"
-		#	s/{HEADER_ADMIN_USER}/$header_user/;
+
-		#" < $template > $config
+			/usr/share/egroupware/doc/rpm-build/post_install.php \
-	#fi
+				--config_user "$header_user" \
+				--config_passwd "$header_password" \
+				--admin_user "$admin_user" \
+				--admin_passwd "$admin_password" \
+				--lang "$lang" \
+				--db_type mysql \
+				--db_root "$db_root" \
+				--db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log
+		fi
+	fi
+	echo "EGroupware install log saved to $install_log"
 
 	# Only change permissions during initial installation, in case
 	# someone wants a different setup.