summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2014-07-21 22:06:14 +0100
committerJoe Orton <jorton@redhat.com>2014-07-21 22:06:14 +0100
commit1fce54ba4f8d3df9a94a8e063290a7022c61832e (patch)
tree86ec74ef3dc3b998644bc1bfdd73b5c6cf218930 /httpd.spec
parent94c96741e2ace94ffe3c27798611b2a294315e03 (diff)
downloadhttpd-1fce54ba4f8d3df9a94a8e063290a7022c61832e.tar.gz
httpd-1fce54ba4f8d3df9a94a8e063290a7022c61832e.tar.xz
httpd-1fce54ba4f8d3df9a94a8e063290a7022c61832e.zip
expand variables in docdir example configs
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec10
1 files changed, 10 insertions, 0 deletions
diff --git a/httpd.spec b/httpd.spec
index 1a28839..3055af4 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -343,6 +343,15 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
$RPM_BUILD_ROOT/run/httpd/htcacheclean
+# Substitute in defaults which are usually done (badly) by "make install"
+sed -i \
+ "s,@@ServerRoot@@/var,%{_localstatedir}/lib/dav,;
+ s,@@ServerRoot@@/user.passwd,/etc/httpd/conf/user.passwd,;
+ s,@@ServerRoot@@/docs,%{docroot},;
+ s,@@ServerRoot@@,%{docroot},;
+ s,@@Port@@,80,;" \
+ docs/conf/extra/*.conf
+
# Create cache directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
@@ -645,6 +654,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1
- update to 2.4.10
+- expand variables in docdir example configs
* Tue Jul 08 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-8
- add support for systemd socket activation (#1111648)