diff --git a/srcpkgs/nginx/files/nginx.service b/srcpkgs/nginx/files/nginx.service deleted file mode 100644 index 78d0a492c4..0000000000 --- a/srcpkgs/nginx/files/nginx.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=A high performance web server and a reverse proxy server - -[Service] -Type=forking -PIDFile=/run/nginx.pid -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 6651829c0c..3b69760013 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx version=1.8.0 -revision=4 +revision=5 makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" if [ "$CROSS_BUILD" ]; then # fake configure run on host @@ -30,7 +30,7 @@ homepage="http://nginx.org" distfiles="http://nginx.org/download/nginx-$version.tar.gz" checksum=23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 -build_options="systemd geoip" +build_options="geoip" build_options_default="geoip" do_configure() { @@ -90,8 +90,4 @@ do_install() { vlicense LICENSE vsv nginx - - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system - fi }