gunnar: server Makefile,1.105,1.106 test_environment.dist,1.2,1.3

cvs at kolab.org cvs at kolab.org
Fri Feb 12 21:02:55 CET 2010


Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20887

Modified Files:
	Makefile test_environment.dist 
Log Message:
Allow to install several servers on the same machine with the install-server targets. Add a KOLAB_VERSION variable.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- Makefile	12 Feb 2010 19:45:13 -0000	1.105
+++ Makefile	12 Feb 2010 20:02:53 -0000	1.106
@@ -162,8 +162,8 @@
 BASE_FILES=install-kolab.sh \
            1st.README
 
-CURRENT_SOURCE_RELEASE = http://files.kolab.org/server/release/kolab-server-2.2.3/sources/
-CURRENT_BINARY_RELEASE = http://files.kolab.org/server/release/kolab-server-2.2.3/$(PLATFORM)/
+CURRENT_SOURCE_RELEASE = http://files.kolab.org/server/release/kolab-server-$(KOLAB_VERSION)/sources/
+CURRENT_BINARY_RELEASE = http://files.kolab.org/server/release/kolab-server-$(KOLAB_VERSION)/$(PLATFORM)/
 
 PHPUNIT=$(HOME)/bin/phpunit
 
@@ -451,7 +451,7 @@
 
 # Installs the Kolab server from the binary packages
 $(KOLABDIR): $(BINARY_PKGS_DIR)
-	cd $(BINARY_PKGS_DIR) && sh install-kolab.sh 2>&1 | tee kolab-install.log
+	cd $(BINARY_PKGS_DIR) && sh install-kolab.sh -t $(KOLABUSR) -I $(KOLABUID) 2>&1 | tee kolab-install.log
 
 # Convenience target for downloading the source server packages
 .PHONY:download-source
@@ -467,7 +467,7 @@
 # on a platform where binaries cannot be downloaded from files.kolab.org
 .PHONY:install-server-from-source
 install-server-from-source: $(SOURCE_PKGS_DIR)
-	cd $(SOURCE_PKGS_DIR) && sh install-kolab.sh 2>&1 | tee kolab-install.log
+	cd $(SOURCE_PKGS_DIR) && sh install-kolab.sh -t $(KOLABUSR) -I $(KOLABUID) 2>&1 | tee kolab-install.log
 
 # Convenience target to uninstall the server
 .PHONY:clean-server

Index: test_environment.dist
===================================================================
RCS file: /kolabrepository/server/test_environment.dist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_environment.dist	9 Feb 2010 16:18:55 -0000	1.2
+++ test_environment.dist	12 Feb 2010 20:02:53 -0000	1.3
@@ -12,3 +12,6 @@
 
 # The location to which the Kolab server should be installed.
 KOLABDIR=/kolab
+
+# Create the Kolab user with this uid
+KOLABUID=19414





More information about the commits mailing list