forked from pool/apache2
Accepting request 81909 from home:fcrozat:systemd
- Add apache2-systemd-ask-pass / apache2.service / start_apache2 and modify apache2-ssl-global.conf for systemd support (bnc#697137). OBS-URL: https://build.opensuse.org/request/show/81909 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=335
This commit is contained in:
committed by
Git OBS Bridge
parent
90508856d0
commit
f247c8cfd7
10
apache2.spec
10
apache2.spec
@@ -116,6 +116,9 @@ Source130: apache2-vhost.template
|
||||
Source131: apache2-vhost-ssl.template
|
||||
Source140: apache2-check_forensic
|
||||
Source141: apache-20-22-upgrade
|
||||
Source142: start_apache2
|
||||
Source143: apache2-systemd-ask-pass
|
||||
Source144: apache2.service
|
||||
Patch2: httpd-2.1.3alpha-layout.dif
|
||||
Patch23: httpd-2.1.9-apachectl.dif
|
||||
Patch65: httpd-2.0.49-log_server_status.dif
|
||||
@@ -595,7 +598,11 @@ tar xjf %{SOURCE29} -C $RPM_BUILD_ROOT/%{sysconfdir}
|
||||
#
|
||||
# init script and friends
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/init.d
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/lib/systemd/system/
|
||||
install -m 744 $RPM_SOURCE_DIR/rc.%{pname} $RPM_BUILD_ROOT/etc/init.d/%{pname}
|
||||
install -m 744 $RPM_SOURCE_DIR/start_apache2 $RPM_BUILD_ROOT/usr/sbin/start_apache2
|
||||
install -m 744 $RPM_SOURCE_DIR/apache2-systemd-ask-pass $RPM_BUILD_ROOT/usr/sbin/apache2-systemd-ask-pass
|
||||
install -m 744 $RPM_SOURCE_DIR/apache2.service $RPM_BUILD_ROOT/lib/systemd/system/apache2.service
|
||||
ln -sf ../../etc/init.d/%{pname} $RPM_BUILD_ROOT/%{_sbindir}/rc%{pname}
|
||||
install -m 755 $RPM_SOURCE_DIR/load_configuration $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/
|
||||
install -m 755 $RPM_SOURCE_DIR/find_mpm $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/
|
||||
@@ -853,6 +860,7 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
|
||||
%config(noreplace) /etc/permissions.d/%{pname}
|
||||
%endif
|
||||
%config /etc/init.d/%{pname}
|
||||
/lib/systemd/system/%{pname}.service
|
||||
#
|
||||
%{_sbindir}/rc%{pname}
|
||||
%{_sbindir}/apache%{vers}ctl
|
||||
@@ -863,6 +871,8 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
|
||||
%{_sbindir}/a2enmod
|
||||
%{_sbindir}/a2disflag
|
||||
%{_sbindir}/a2dismod
|
||||
%{_sbindir}/start_apache2
|
||||
%{_sbindir}/apache2-systemd-ask-pass
|
||||
%{_bindir}/log_server_status%{vers}
|
||||
%{iconsdir}
|
||||
%{errordir}
|
||||
|
Reference in New Issue
Block a user