apache: remove systemd support.
This commit is contained in:
parent
3ae79a6cfb
commit
01364e2d23
|
@ -1,16 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=The Apache HTTP Server
|
|
||||||
After=syslog.target network.target remote-fs.target
|
|
||||||
Conflicts=apache-mpm-event.service apache-mpm-worker.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=forking
|
|
||||||
PIDFile=/var/run/httpd/httpd.pid
|
|
||||||
ExecStart=/usr/bin/httpd -k start
|
|
||||||
ExecReload=/usr/bin/httpd -t
|
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
|
||||||
ExecStop=/usr/bin/httpd -k stop
|
|
||||||
PrivateTmp=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
|
@ -1,4 +0,0 @@
|
||||||
d /run/httpd 710 root httpd
|
|
||||||
d /var/log/httpd 755 root httpd
|
|
||||||
d /srv/httpd 755 root httpd
|
|
||||||
d /srv/httpd/cgi-bin 755 root httpd
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'apache'
|
# Template file for 'apache'
|
||||||
pkgname=apache
|
pkgname=apache
|
||||||
version=2.4.12
|
version=2.4.12
|
||||||
revision=4
|
revision=5
|
||||||
wrksrc=httpd-${version}
|
wrksrc=httpd-${version}
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
|
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
|
||||||
|
@ -45,9 +45,6 @@ license="Apache-2.0"
|
||||||
distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
|
distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
|
||||||
checksum=ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4
|
checksum=ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4
|
||||||
|
|
||||||
broken="http://build.voidlinux.eu/builders/x86_64_builder/builds/13125/steps/shell_3/logs/stdio"
|
|
||||||
|
|
||||||
build_options="systemd"
|
|
||||||
system_accounts="httpd"
|
system_accounts="httpd"
|
||||||
httpd_descr="Apache HTTP server"
|
httpd_descr="Apache HTTP server"
|
||||||
httpd_homedir="/srv/httpd"
|
httpd_homedir="/srv/httpd"
|
||||||
|
@ -119,11 +116,6 @@ post_install() {
|
||||||
# systemd and logrotate files.
|
# systemd and logrotate files.
|
||||||
vinstall ${FILESDIR}/apache.logrotate 644 etc/logrotate.d apache
|
vinstall ${FILESDIR}/apache.logrotate 644 etc/logrotate.d apache
|
||||||
|
|
||||||
if [ "$build_option_systemd" ]; then
|
|
||||||
vinstall ${FILESDIR}/apache.service 644 usr/lib/systemd/system
|
|
||||||
vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
vsv apache
|
vsv apache
|
||||||
|
|
||||||
rm -rf ${DESTDIR}/etc/httpd/original
|
rm -rf ${DESTDIR}/etc/httpd/original
|
||||||
|
|
Loading…
Reference in New Issue