Accepting request 417081 from home:scarabeus_iv:branches:Apache
- Remove the omc xml config. It is useless nowdays OBS-URL: https://build.opensuse.org/request/show/417081 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=486
This commit is contained in:
Git OBS Bridge
parent
147675ed80
commit
53c58c3097
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 5 11:36:28 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
- Remove the omc xml config. It is useless nowdays
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 5 09:15:11 UTC 2016 - pgajdos@suse.com
|
||||
|
||||
|
||||
@ -80,7 +80,6 @@ Source31: apache2-README-instances.txt
|
||||
Source45: sysconf_addword
|
||||
Source46: a2enflag
|
||||
Source47: a2enmod
|
||||
Source48: apache2.xml
|
||||
Source49: apache2.firewall
|
||||
Source50: apache2.ssl-firewall
|
||||
Source100: apache2-httpd.conf
|
||||
@ -525,10 +524,6 @@ install -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_sysconfdir}/logr
|
||||
install -m 755 $RPM_SOURCE_DIR/apache2-check_forensic %{buildroot}/%{_bindir}/check_forensic
|
||||
install -m 755 $RPM_SOURCE_DIR/apache2-find-directives %{buildroot}/%{_bindir}/
|
||||
#
|
||||
# xml stuff
|
||||
install -d %{buildroot}%{_datadir}/omc/svcinfo.d/
|
||||
install -m 644 %{SOURCE48} %{buildroot}%{_datadir}/omc/svcinfo.d/
|
||||
#
|
||||
# ssl stuff
|
||||
install -m 755 %{SOURCE25} %{buildroot}/%{_bindir}/
|
||||
tar xjf %{SOURCE29} -C %{buildroot}/%{sysconfdir}
|
||||
@ -794,7 +789,6 @@ mv %{buildroot}/%{sysconfdir}/original .
|
||||
%dir %{sysconfdir}/conf.d
|
||||
%dir %{sysconfdir}/vhosts.d
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||
%{_datadir}/omc/svcinfo.d/apache2.xml
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%{_unitdir}/apache2.service
|
||||
%{_unitdir}/apache2@.service
|
||||
|
||||
92
apache2.xml
92
apache2.xml
@ -1,92 +0,0 @@
|
||||
<?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>httpd-worker</name>
|
||||
<modulePath>/usr/sbin/httpd-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