summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/dist/centos-clarkconnect3
-rw-r--r--conf/dist/common1
-rw-r--r--conf/dist/debian3
-rw-r--r--conf/dist/fedora3
-rw-r--r--conf/dist/kolab3
-rw-r--r--conf/dist/kolabsrv.in12
-rw-r--r--conf/dist/mandriva3
-rw-r--r--conf/dist/suse3
8 files changed, 7 insertions, 24 deletions
diff --git a/conf/dist/centos-clarkconnect b/conf/dist/centos-clarkconnect
index cd2e9f7..3aa5958 100644
--- a/conf/dist/centos-clarkconnect
+++ b/conf/dist/centos-clarkconnect
@@ -36,9 +36,6 @@ PERL=${bindir}/perl
PHP=${bindir}/engine
RPM=/bin/rpm
-# Define the deamons that are launched from /etc/init.d
-LDAPD=ldap
-
kolab_rcdir=${sysconfdir}/rc.d/init.d
pkgdocdir=${datadir}/doc/kolab-2.1
kolabconf_script=${sbindir}/kolabconf
diff --git a/conf/dist/common b/conf/dist/common
index bf4372c..7563a21 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -14,7 +14,6 @@ do_subst = sed \
-e 's=[@]BASH[@]=$(BASHELL)=g' \
-e 's=[@]CHKCONFIG[@]=$(CHKCONFIG)=g' \
-e 's=[@]KOLABRC[@]=$(KOLABRC)=g' \
- -e 's=[@]LDAPD[@]=$(LDAPD)=g' \
-e 's=[@]PERL[@]=$(PERL)=g' \
-e 's=[@]PHP[@]=$(PHP)=g' \
-e 's=[@]RPM[@]=$(RPM)=g' \
diff --git a/conf/dist/debian b/conf/dist/debian
index e53461b..bd19c65 100644
--- a/conf/dist/debian
+++ b/conf/dist/debian
@@ -17,9 +17,6 @@ kolab_susr=root
restricted_kolab_usr=kolab
restricted_kolab_grp=kolab
-# Define the deamons that are executed with openpkg rc
-LDAPD=slapd
-
kolab_rcdir=${sysconfdir}/init.d
pkgdocdir=${datadir}/doc/kolab
kolabconf_script=${sbindir}/kolabconf
diff --git a/conf/dist/fedora b/conf/dist/fedora
index ce73c05..52031da 100644
--- a/conf/dist/fedora
+++ b/conf/dist/fedora
@@ -19,9 +19,6 @@ PHP=${bindir}/php
RPM=${bindir}/rpm
TAR=${bindir}/tar
-# Define the deamons that are launched from /etc/init.d
-LDAPD=ldap
-
kolab_rcdir=${sysconfdir}/rc.d/init.d
pkgdocdir=${datadir}/doc/kolab-2.3
kolabconf_script=${sbindir}/kolabconf
diff --git a/conf/dist/kolab b/conf/dist/kolab
index 0b77355..39b013a 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -15,9 +15,6 @@ kolab_rusr:=$(shell $(RPM) --eval %{l_rusr})
kolab_rgrp:=$(shell $(RPM) --eval %{l_rgrp})
kolab_susr:=$(shell $(RPM) --eval %{l_susr})
-# Define the deamons that are executed with openpkg rc
-LDAPD=openldap
-
kolab_rcdir=${sysconfdir}/rc.d
pkgdocdir=${datadir}/doc
kolabconf_script=${sbindir}/kolabconf
diff --git a/conf/dist/kolabsrv.in b/conf/dist/kolabsrv.in
index 0ad95c9..ba64837 100644
--- a/conf/dist/kolabsrv.in
+++ b/conf/dist/kolabsrv.in
@@ -37,10 +37,10 @@ function getServiceName() {
# Perhaps better use:
# lsb_release -i | cut -f2
case $system in
- redhat)
+ redhat|fedora)
case $sname in
apache) SERVICE="httpd" ;;
- openldap) SERVICE="@LDAPD@" ;;
+ openldap) SERVICE="ldap" ;;
sasl) SERVICE="saslauthd" ;;
imapd) SERVICE="cyrus-imapd" ;;
amavisd) SERVICE="amavisd" ;;
@@ -52,7 +52,7 @@ function getServiceName() {
opensuse)
case $sname in
apache) SERVICE="apache2" ;;
- openldap) SERVICE="@LDAPD@" ;;
+ openldap) SERVICE="ldap" ;;
sasl) SERVICE="saslauthd" ;;
imapd) SERVICE="cyrus" ;;
amavisd) SERVICE="amavis" ;;
@@ -63,7 +63,7 @@ function getServiceName() {
debian)
case $sname in
apache) SERVICE="apache2" ;;
- openldap) SERVICE="@LDAPD@" ;;
+ openldap) SERVICE="slapd" ;;
sasl) SERVICE="saslauthd" ;;
imapd) SERVICE="kolab-cyrus" ;;
amavisd) SERVICE="amavis" ;;
@@ -76,7 +76,7 @@ function getServiceName() {
mandriva)
case $sname in
apache) SERVICE="httpd" ;;
- openldap) SERVICE="@LDAPD@" ;;
+ openldap) SERVICE="ldap" ;;
sasl) SERVICE="saslauthd" ;;
imapd) SERVICE="cyrus-imapd" ;;
amavisd) SERVICE="amavisd" ;;
@@ -96,6 +96,8 @@ if [ -f /etc/arch-release ]; then
system=arch
elif [ -f /etc/redhat-release ]; then
system=redhat
+elif [ -f /etc/fedora-release ]; then
+ system=fedora
elif [ -f /etc/SuSE-release ]; then
system=opensuse
elif [ -f /etc/gentoo-release ]; then
diff --git a/conf/dist/mandriva b/conf/dist/mandriva
index 9e24586..e42fcf6 100644
--- a/conf/dist/mandriva
+++ b/conf/dist/mandriva
@@ -16,9 +16,6 @@ PHP=${bindir}/php
RPM=/bin/rpm
TAR=/bin/tar
-# Define the deamons that are launched from /etc/init.d
-LDAPD=ldap
-
kolab_rcdir=${sysconfdir}/rc.d/init.d
pkgdocdir=${datadir}/doc/kolab
kolabconf_script=${sbindir}/kolabconf
diff --git a/conf/dist/suse b/conf/dist/suse
index 1527012..72729fb 100644
--- a/conf/dist/suse
+++ b/conf/dist/suse
@@ -15,9 +15,6 @@ PHP=${bindir}/php5
RPM=/bin/rpm
TAR=/bin/tar
-# Define the deamons that are launched from /etc/init.d
-LDAPD=ldap
-
kolab_rcdir=${sysconfdir}/init.d
pkgdocdir=${datadir}/doc/packages/kolab
kolabconf_script=${sbindir}/kolabconf