97 lines
4.5 KiB
Diff
97 lines
4.5 KiB
Diff
diff -uNr zarafa-7.1.9.orig/installer/linux/Makefile.am zarafa-7.1.9/installer/linux/Makefile.am
|
|
--- zarafa-7.1.9.orig/installer/linux/Makefile.am 2014-06-26 14:42:22.479211315 +0200
|
|
+++ zarafa-7.1.9/installer/linux/Makefile.am 2014-06-26 14:43:27.764208414 +0200
|
|
@@ -29,7 +29,7 @@
|
|
sysconf_initdir=${sysconfdir}/init.d
|
|
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
|
|
|
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
|
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
|
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
|
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
|
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
|
diff -uNr zarafa-7.1.9.orig/installer/userscripts/createcompany.in zarafa-7.1.9/installer/userscripts/createcompany.in
|
|
--- zarafa-7.1.9.orig/installer/userscripts/createcompany.in 2014-06-26 14:42:22.477211315 +0200
|
|
+++ zarafa-7.1.9/installer/userscripts/createcompany.in 2014-06-26 14:43:27.764208414 +0200
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa-server
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.1.9.orig/installer/userscripts/creategroup.in zarafa-7.1.9/installer/userscripts/creategroup.in
|
|
--- zarafa-7.1.9.orig/installer/userscripts/creategroup.in 2014-06-26 14:42:22.478211315 +0200
|
|
+++ zarafa-7.1.9/installer/userscripts/creategroup.in 2014-06-26 14:43:27.764208414 +0200
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa-server
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.1.9.orig/installer/userscripts/createuser.in zarafa-7.1.9/installer/userscripts/createuser.in
|
|
--- zarafa-7.1.9.orig/installer/userscripts/createuser.in 2014-06-26 14:42:22.478211315 +0200
|
|
+++ zarafa-7.1.9/installer/userscripts/createuser.in 2014-06-26 14:43:27.765208414 +0200
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa-server
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.1.9.orig/installer/userscripts/deletecompany.in zarafa-7.1.9/installer/userscripts/deletecompany.in
|
|
--- zarafa-7.1.9.orig/installer/userscripts/deletecompany.in 2014-06-26 14:42:22.478211315 +0200
|
|
+++ zarafa-7.1.9/installer/userscripts/deletecompany.in 2014-06-26 14:44:16.158206264 +0200
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.1.9.orig/installer/userscripts/deletegroup.in zarafa-7.1.9/installer/userscripts/deletegroup.in
|
|
--- zarafa-7.1.9.orig/installer/userscripts/deletegroup.in 2014-06-26 14:42:22.478211315 +0200
|
|
+++ zarafa-7.1.9/installer/userscripts/deletegroup.in 2014-06-26 14:44:26.328205812 +0200
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.1.9.orig/installer/userscripts/deleteuser.in zarafa-7.1.9/installer/userscripts/deleteuser.in
|
|
--- zarafa-7.1.9.orig/installer/userscripts/deleteuser.in 2014-06-26 14:42:22.478211315 +0200
|
|
+++ zarafa-7.1.9/installer/userscripts/deleteuser.in 2014-06-26 14:44:34.925205430 +0200
|
|
@@ -9,8 +9,8 @@
|
|
# that this string can contain any characters, so take heed to correct
|
|
# quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|