Permalink
Browse files

nginx: do not install systemd stuff silently

  • Loading branch information...
1 parent 193cd23 commit cf200325571aa183398919ac659a3b58ec14b396 @angryvincent angryvincent committed Oct 3, 2013
Showing with 1 addition and 17 deletions.
  1. +0 −14 www-servers/nginx/files/nginx.service-r1
  2. +1 −3 www-servers/nginx/nginx-1.4.2.ebuild
View
14 www-servers/nginx/files/nginx.service-r1
@@ -1,14 +0,0 @@
-[Unit]
-Description=The nginx HTTP and reverse proxy server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t
-ExecStart=/usr/sbin/nginx
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=/bin/kill -QUIT $MAINPID
-
-[Install]
-WantedBy=multi-user.target
View
4 www-servers/nginx/nginx-1.4.2.ebuild
@@ -119,7 +119,7 @@ HTTP_SECURITY_MODULE_P="modsecurity-apache_${HTTP_SECURITY_MODULE_PV}"
HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator
+inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user versionator
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
HOMEPAGE="http://nginx.org"
@@ -462,8 +462,6 @@ src_install() {
newinitd "${FILESDIR}"/${PVR}/nginx.initd nginx
- systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
dodir /etc/${PN}/sites-{available,enabled}
insinto /etc/${PN}/sites-available
doins "$FILESDIR"/${PVR}/sites-available/localhost

0 comments on commit cf20032

Please sign in to comment.