From a516865a5966798c45ad8644b9cf46988b8fba3b Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 25 Nov 2008 14:11:32 +0000 Subject: [PATCH] Fixed config location git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13029 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/redhat/gosa_2_6.spec | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/gosa-core/redhat/gosa_2_6.spec b/gosa-core/redhat/gosa_2_6.spec index 02e4b03ea..b8956ea3b 100644 --- a/gosa-core/redhat/gosa_2_6.spec +++ b/gosa-core/redhat/gosa_2_6.spec @@ -191,11 +191,12 @@ done mkdir -p %{buildroot}/usr/sbin mkdir -p %{buildroot}/etc/gosa mkdir -p %{buildroot}/usr/share/doc/gosa +mkdir -p %{buildroot}/etc/httpd/conf.d mv contrib/gosa.conf %{buildroot}/usr/share/doc/gosa mv update-gosa %{buildroot}/usr/sbin mv bin/gosa-encrypt-passwords %{buildroot}/usr/sbin -mv debian/gosa-apache.conf %{buildroot}/etc/httpd/conf.d/ +mv debian/gosa-apache.conf %{buildroot}/etc/httpd/conf.d mv contrib/shells %{buildroot}/etc/gosa mv contrib/encodings %{buildroot}/etc/gosa mv contrib/openldap/slapd.conf %{buildroot}/usr/share/doc/gosa/slapd.conf-example @@ -221,27 +222,11 @@ rm -rf %{buildroot}/usr/share/gosa/doc/guide/user/*/lyx-source mkdir -p %{buildroot}%{confdir} mkdir -p %{buildroot}%{webconf} -#cat > %{buildroot}%{webconf}/gosa_include.conf < -# Options None -# AllowOverride None -# Order allow,deny -# Allow from all -# -## Set alias to gosa -#Alias /gosa /usr/share/gosa/html -#EOF - # Copy file for gosa-schema mkdir -p %{buildroot}/etc/openldap/schema/gosa mv contrib/openldap/*.schema %{buildroot}/etc/openldap/schema/gosa -sed 's§"CONFIG_TEMPLATE_DIR", "../contrib/"§"CONFIG_TEMPLATE_DIR", "%{docdir}/"§g' %{buildroot}/usr/share/gosa/include/functions.inc > %{buildroot}/usr/share/gosa/include/functions.inc.new - -mv -f %{buildroot}/usr/share/gosa/include/functions.inc.new %{buildroot}/usr/share/gosa/include/functions.inc - # Copy files for gosa-dev mkdir -p %{buildroot}/usr/bin mv update-locale %{buildroot}/usr/bin @@ -308,11 +293,10 @@ rm -rf %{buildroot} %config %attr(-,root,root) /usr/share/doc/gosa/slapd.conf-example %attr(755,root,root) /usr/sbin/update-gosa %attr(755,root,root) /usr/share/man/man1/update-gosa.1.gz -%attr(644,root,root) /etc/gosa/gosa-apache.conf %attr(644,root,root) /etc/gosa/shells %attr(644,root,root) /etc/gosa/encodings %attr(755,root,root) /usr/sbin/gosa-encrypt-passwords -%config(noreplace) %attr(0600,%{apacheuser},%{apachegroup}) %{webconf}/gosa_include.conf +%config(noreplace) %attr(0600,%{apacheuser},%{apachegroup}) %{webconf}/gosa-apache.conf %attr(0700, %{apacheuser}, %{apachegroup}) /var/spool/gosa %attr(0755, root,root) /usr/share/gosa/html %attr(0755, root,root) /usr/share/gosa/ihtml -- 2.30.2