summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-02-12 20:02:53 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-02-12 20:02:53 (GMT)
commitc30f139e50b631173305fa68a3f801db07faa1e0 (patch)
treeb8038793da22c507dfd9e37972087d06f967908b
parentd5552a1eb359a4469caa9496e2fcd901703f35c5 (diff)
downloadserver-c30f139e50b631173305fa68a3f801db07faa1e0.tar.gz
Allow to install several servers on the same machine with the install-server targets. Add a KOLAB_VERSION variable.
-rw-r--r--Makefile8
-rw-r--r--make-helper/kolab.mk18
-rw-r--r--test_environment.dist3
3 files changed, 18 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 04883ab..8f57a34 100644
--- a/Makefile
+++ b/Makefile
@@ -162,8 +162,8 @@ CLIENT_PACKAGES=kolab-webclient/dimp \
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 @@ $(BINARY_PKGS_DIR):
# 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 @@ $(SOURCE_PKGS_DIR):
# 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
diff --git a/make-helper/kolab.mk b/make-helper/kolab.mk
index 5da762e..53387ba 100644
--- a/make-helper/kolab.mk
+++ b/make-helper/kolab.mk
@@ -1,19 +1,23 @@
+KOLAB_VERSION = 2.2.3
+
# Check if we are in a test environment
TEST_ENVIRONMENT=$(shell test -e test_environment && echo YES)
ifeq "x$(TEST_ENVIRONMENT)" "xYES"
BINARY_PKGS_DIR=$(shell source test_environment && echo $$BINARY_PKGS_DIR)
SOURCE_PKGS_DIR=$(shell source test_environment && echo $$SOURCE_PKGS_DIR)
+ KOLABDIR=$(shell source test_environment && echo $$KOLABDIR)
+ KOLABUID=$(shell source test_environment && echo $$KOLABUID)
+ OPENPKG=$(KOLABDIR)/bin/openpkg
+else
+ BINARY_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/ix86-debian5.0
+ SOURCE_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/sources
+ KOLABUID=19414
endif
# Initial sanity check for the OpenPKG tool
-OPENPKG=$(shell which openpkg && echo YES)
+OPENPKG ?= $(shell which openpkg && echo YES)
ifeq "x$(OPENPKG)" "x"
- ifeq "x$(TEST_ENVIRONMENT)" "x"
- $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`")
- else
- KOLABDIR=$(shell source test_environment && echo $$KOLABDIR)
- OPENPKG=$(KOLABDIR)/bin/openpkg
- endif
+ $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`")
endif
# Set KOLABDIR to the base directory of the OpenPKG/Kolab installation if it is unset
diff --git a/test_environment.dist b/test_environment.dist
index c623043..f1cbc4e 100644
--- a/test_environment.dist
+++ b/test_environment.dist
@@ -12,3 +12,6 @@ SOURCE_PKGS_DIR=/root/kolab-server-2.2.3/sources
# The location to which the Kolab server should be installed.
KOLABDIR=/kolab
+
+# Create the Kolab user with this uid
+KOLABUID=19414