pool/apache2
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 102748 from home:computersalat:devel:apache

Browse Source 
add default vhost configs

OBS-URL: https://build.opensuse.org/request/show/102748
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=355
This commit is contained in:
Factory Maintainer
2012-02-11 08:39:57 +00:00
committed by Git OBS Bridge
parent 58cce20330
commit dc9fbb8810
5 changed files with 432 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apache2.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package apache2
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
#
Name: apache2
BuildRequires: automake
BuildRequires: db-devel
@@ -88,8 +89,9 @@ Source11: rc.%{pname}
Source13: sysconfig.%{pname}
Source18: robots.txt
Source20: favicon.ico
Source22: apache2-README.QUICKSTART
Source24: apache2-README
Source22: apache2-README
Source23: apache2-README.QUICKSTART
Source24: apache2-README.default-vhost
Source25: gensslcert
Source27: %{pname}.logrotate
Source28: permissions.%{pname}
@@ -124,6 +126,8 @@ Source114: apache2-mod_usertrack.conf
Source115: apache2-mod_reqtimeout.conf
Source130: apache2-vhost.template
Source131: apache2-vhost-ssl.template
Source132: apache2-default-vhost.conf
Source133: apache2-default-vhost-ssl.conf
Source140: apache2-check_forensic
Source141: apache-20-22-upgrade
Source142: start_apache2
@@ -359,6 +363,15 @@ to administrators of web servers in general.
%patch106
#
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# install READMEs
a=$(basename %{S:22})
cp %{S:22} ./${a##%{name}-}
b=$(basename %{S:23})
cp %{S:23} ./${b##%{name}-}
c=$(basename %{S:24})
cp %{S:24} ./${c##%{name}-}
#
# replace PLATFORM string that's seen in the "Server:" header
#
@@ -641,10 +654,6 @@ all_modules=$(echo $all_modules | fmt | sed 's/\(.*\)/# \1\\/')
sed "s+@@all_modules@@+$all_modules +" $RPM_SOURCE_DIR/sysconfig.%{pname} \
> $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/sysconfig.%{pname}
#
# install READMEs
cp -p $RPM_SOURCE_DIR/%{pname}-README README.%VENDOR
cp -p $RPM_SOURCE_DIR/%{pname}-README.QUICKSTART README.QUICKSTART
#
# install configuration files:
mkdir -p $RPM_BUILD_ROOT/%{runtimedir}
touch $RPM_BUILD_ROOT/%{sysconfdir}/sysconfig.d/include.conf
@@ -681,9 +690,14 @@ for mpm_conf in $mpm_confs; do
;;
esac
done
install -m 644 $RPM_SOURCE_DIR/apache2-vhost.template $RPM_BUILD_ROOT/%{sysconfdir}/vhosts.d/vhost.template
install -m 644 $RPM_SOURCE_DIR/apache2-vhost-ssl.template $RPM_BUILD_ROOT/%{sysconfdir}/vhosts.d/vhost-ssl.template
install -m 644 $RPM_SOURCE_DIR/apache2-manual.conf $RPM_BUILD_ROOT/%{sysconfdir}/conf.d/
install -m 644 %{S:130} $RPM_BUILD_ROOT/%{sysconfdir}/vhosts.d/vhost.template
install -m 644 %{S:131} $RPM_BUILD_ROOT/%{sysconfdir}/vhosts.d/vhost-ssl.template
install -m 644 %{S:104} $RPM_BUILD_ROOT/%{sysconfdir}/conf.d/manual.conf
# install default vhost
dvh=$(basename %{S:132})
install -m 644 %{S:132} $RPM_BUILD_ROOT/%{sysconfdir}/${dvh##%{name}-}
dvhs=$(basename %{S:133})
install -m 644 %{S:133} $RPM_BUILD_ROOT/%{sysconfdir}/${dvhs##%{name}-}
# for mod_auth_ldap
install -m 644 docs/conf/charset.conv $RPM_BUILD_ROOT/%{sysconfdir}/
@@ -949,7 +963,7 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
%doc %{manualdir}
%dir %{sysconfdir}
%dir %{sysconfdir}/conf.d
%config %{sysconfdir}/conf.d/apache2-manual.conf
%config %{sysconfdir}/conf.d/manual.conf
%files example-pages
%defattr(-,root,root)