diff --git a/srcpkgs/apache-mpm-event/files/apache-mpm-event.service b/srcpkgs/apache-mpm-event/files/apache-mpm-event.service index cda2f7eafc..98ccdf3335 100644 --- a/srcpkgs/apache-mpm-event/files/apache-mpm-event.service +++ b/srcpkgs/apache-mpm-event/files/apache-mpm-event.service @@ -1,7 +1,7 @@ [Unit] Description=The Apache HTTP Server (Event MPM) After=syslog.target network.target remote-fs.target -Conflicts=apache.target apache-mpm-worker.target +Conflicts=apache.service apache-mpm-worker.service [Service] Type=forking diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template index 1e097ac835..84345ab1ef 100644 --- a/srcpkgs/apache-mpm-event/template +++ b/srcpkgs/apache-mpm-event/template @@ -10,7 +10,7 @@ unset post_install pre_configure run_depends # Override some vars. pkgname=apache-mpm-event configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=event" -revision=2 +revision=3 short_desc="Apache HTTP Server - event driven model" long_desc=" Each Apache Multi-Processing Module provides a different flavor of web @@ -42,5 +42,5 @@ post_install() { cp -f ${DESTDIR}/usr/sbin/httpd ${wrksrc} rm -rf ${DESTDIR}/* vinstall httpd 755 usr/sbin httpd.event - vinstall ${FILESDIR}/apache-mpm-event.service 644 lib/systemd/system + vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system }