[packages/php-eaccelerator] move apache config as separate file

glen glen at pld-linux.org
Tue Apr 29 08:35:21 CEST 2014


commit 721a63eb013134f0214cfe2f1a1f3c644d51af7f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 29 09:33:47 2014 +0300

    move apache config as separate file

 apache.conf           |  5 +++++
 php-eaccelerator.spec | 13 +++----------
 2 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/php-eaccelerator.spec b/php-eaccelerator.spec
index bbcd575..33442b8 100644
--- a/php-eaccelerator.spec
+++ b/php-eaccelerator.spec
@@ -9,6 +9,7 @@ Group:		Libraries
 Source0:	http://bart.eaccelerator.net/source/%{version}/%{pkgname}-%{version}.tar.bz2
 # Source0-md5:	32ccd838e06ef5613c2610c1c65ed228
 Source1:	%{pkgname}.ini
+Source2:	apache.conf
 URL:		http://www.eaccelerator.net/
 BuildRequires:	php-devel >= 3:5.1.0
 BuildRequires:	rpmbuild(macros) >= 1.344
@@ -65,14 +66,6 @@ Więcej informacji można znaleźć pod %{url}.
 %prep
 %setup -q -n %{pkgname}-%{version}
 
-cat > apache.conf <<EOF
-Alias /%{_webapp} %{_appdir}
-<Directory %{_appdir}/>
-	Order allow,deny
-	Allow from 127.0.0.1
-</Directory>
-EOF
-
 %build
 phpize
 %configure \
@@ -91,8 +84,8 @@ install -p modules/eaccelerator.so $RPM_BUILD_ROOT%{php_extensiondir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{pkgname}.ini
 
 cp -a {PHP_Highlight,control,dasm}.php $RPM_BUILD_ROOT%{_appdir}
-cp -p apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 echo "/var/cache/%{pkgname} 720" > $RPM_BUILD_ROOT/etc/tmpwatch/%{name}.conf
 
diff --git a/apache.conf b/apache.conf
new file mode 100644
index 0000000..316b5f7
--- /dev/null
+++ b/apache.conf
@@ -0,0 +1,5 @@
+Alias /eaccelerator /usr/share/eaccelerator
+<Directory /usr/share/eaccelerator/>
+	Order allow,deny
+	Allow from 127.0.0.1
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-eaccelerator.git/commitdiff/d48a00fd323f4b87782fe8c9dce5f7d7a54a2036



More information about the pld-cvs-commit mailing list