This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
692583743f
commit
69c7adfd38
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 8 11:57:04 CET 2007 - mskibbe@suse.de
|
||||
|
||||
- Apache XML Service Description Document (fate #301708)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 20 15:58:35 CET 2006 - poeml@suse.de
|
||||
|
||||
|
||||
14
apache2.spec
14
apache2.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package apache2 (Version 2.2.3)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -54,7 +54,7 @@ License: The Apache Software License
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
%define realver 2.2.3
|
||||
Version: 2.2.3
|
||||
Release: 23
|
||||
Release: 26
|
||||
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
|
||||
Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
|
||||
Source10: SUSE-NOTICE
|
||||
@ -80,6 +80,7 @@ Source44: find_httpd2_includes
|
||||
Source45: sysconf_addword
|
||||
Source46: a2enflag
|
||||
Source47: a2enmod
|
||||
Source48: apache2.xml
|
||||
Source100: apache2-httpd.conf
|
||||
Source101: apache2-errors.conf
|
||||
Source102: apache2-default-server.conf
|
||||
@ -523,6 +524,10 @@ install -m 644 $RPM_SOURCE_DIR/permissions.%{pname} $RPM_BUILD_ROOT/etc/permissi
|
||||
%endif
|
||||
install -m 755 $RPM_SOURCE_DIR/apache2-check_forensic $RPM_BUILD_ROOT/%{_bindir}/check_forensic%{vers}
|
||||
#
|
||||
# xml stuff
|
||||
install -d $RPM_BUILD_ROOT%{_sysconfdir}/omc/svcinfo.d/
|
||||
install -m 644 %{S:48} $RPM_BUILD_ROOT%{_sysconfdir}/omc/svcinfo.d/
|
||||
#
|
||||
# ssl stuff
|
||||
install -m 755 %{S:25} $RPM_BUILD_ROOT/%{_bindir}/
|
||||
chmod 755 certificate.sh mkcert.sh
|
||||
@ -797,6 +802,9 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
|
||||
%dir %{sysconfdir}/vhosts.d
|
||||
%dir %{sysconfdir}/sysconfig.d
|
||||
%config(noreplace) /etc/logrotate.d/%{pname}
|
||||
%dir %{_sysconfdir}/omc
|
||||
%dir %{_sysconfdir}/omc/svcinfo.d/
|
||||
%{_sysconfdir}/omc/svcinfo.d/apache2.xml
|
||||
%if %{?suse_version:%suse_version}%{?!suse_version:9999} < 1000
|
||||
%config(noreplace) /etc/permissions.d/%{pname}
|
||||
%endif
|
||||
@ -1005,6 +1013,8 @@ if ! test -f /.buildenv; then
|
||||
fi
|
||||
|
||||
%changelog -n apache2
|
||||
* Mon Jan 08 2007 - mskibbe@suse.de
|
||||
- Apache XML Service Description Document (fate #301708)
|
||||
* Wed Dec 20 2006 - poeml@suse.de
|
||||
- set a proper HOME (/var/lib/apache2), otherwise the server might
|
||||
end up HOME=/root and some script might try to use that [#132769]
|
||||
|
||||
92
apache2.xml
Normal file
92
apache2.xml
Normal file
@ -0,0 +1,92 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
Copyright (c) 2006 Novell, Inc. All rights reserved.
|
||||
|
||||
This file should be placed in /etc/omc/svcinfo.d
|
||||
It should be named <service name>.xml. The reason for the naming scheme,
|
||||
is that other services can refer to this service in their dependency list using
|
||||
the file name minus the '.xml' extension.
|
||||
|
||||
Note: The name of the service is the name of this file without the .xml
|
||||
file extension.
|
||||
-->
|
||||
|
||||
<serviceDescription version="1.0">
|
||||
|
||||
<!-- Caption for display purposes -->
|
||||
<caption>Apache Web Server</caption>
|
||||
|
||||
<!-- Description of this service -->
|
||||
<description>
|
||||
Apache is an open source web server that runs on most commonly used
|
||||
platforms. Apache has a modular design that provide a variety of
|
||||
services such as server-side scripting.
|
||||
</description>
|
||||
|
||||
<!--
|
||||
The startCommand tag specifies the command line that will be
|
||||
invoked to start the service. The return code from this command
|
||||
must be as follows:
|
||||
0 - success
|
||||
1 - generic or unspecified error
|
||||
2 - invalid or excess argument(s)
|
||||
3 - unimplemented feature (e.g. "reload")
|
||||
4 - user had insufficient privileges
|
||||
5 - program is not installed
|
||||
6 - program is not configured
|
||||
7 - program is not running
|
||||
-->
|
||||
<startCommand>/usr/sbin/rcapache2 start</startCommand>
|
||||
|
||||
<!--
|
||||
The reStartCommand tag specifies the command line that will be
|
||||
invoked to restart the service. The return code from this command
|
||||
must be as specified in the startCommand tag.
|
||||
-->
|
||||
<reStartCommand>/usr/sbin/rcapache2 restart</reStartCommand>
|
||||
|
||||
<!--
|
||||
The stopCommand tag specifies the command line that will be
|
||||
invoked to stop the service. The return code from this command
|
||||
must be as specified in the startCommand tag.
|
||||
-->
|
||||
<stopCommand>/usr/sbin/rcapache2 stop</stopCommand>
|
||||
|
||||
<!--
|
||||
The statusCommand specifies the command line that can be run
|
||||
that will report on the status of the service. The return code
|
||||
from this command line should be as follows:
|
||||
0 - service up and running
|
||||
1 - service dead, but /var/run/ pid file exists
|
||||
2 - service dead, but /var/lock/ lock file exists
|
||||
3 - service not running (unused)
|
||||
4 - service status unknown :-(
|
||||
-->
|
||||
<statusCommand>/usr/sbin/rcapache2 status</statusCommand>
|
||||
|
||||
<!--
|
||||
The processInformation tag allows the XML Service provider to
|
||||
identify the processes that belong to the service. This allows
|
||||
the ServiceProcess associations to be instrumented.
|
||||
If the process_information tag is not specifed, the will be no
|
||||
ServiceProcess association for the service.
|
||||
-->
|
||||
|
||||
<!-- Following is an example of an Apache process -->
|
||||
<processInformation>
|
||||
<name>httpd2-worker</name>
|
||||
<modulePath>/usr/sbin/httpd2-worker</modulePath>
|
||||
<parameter>-f</parameter>
|
||||
<parameter>/etc/apache2/httpd.conf</parameter>
|
||||
</processInformation>
|
||||
|
||||
<!--
|
||||
Define the services that this service has a dependency on.
|
||||
There must be a corresponding Service Description XML file
|
||||
for the antecedent service in the /etc/omc/svcinfo.d directory.
|
||||
-->
|
||||
<dependsOn>
|
||||
<serviceName>network</serviceName>
|
||||
<serviceName>named</serviceName>
|
||||
</dependsOn>
|
||||
</serviceDescription>
|
||||
Loading…
Reference in New Issue
Block a user