Attachment #385948 for bug #522994

View | Details | Raw Unified | Return to bug 522994
Collapse All | Expand All




		--with-cc-opt="-I${EROOT}usr/include" \
		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
		${myconf} || die "configure failed"

	# A purely cosmetic change that makes nginx -V more readable. This can be

}

src_install() {
	emake DESTDIR="${D%/}" install

	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die

	newinitd "${FILESDIR}"/nginx.initd-r2 nginx



	# just keepdir. do not copy the default htdocs files (bug #449136)
	keepdir /var/www/localhost
	rm -rf "${D}"usr/html || die

	# set up a list of directories to keep
	local keepdir_list="${NGINX_HOME_TMP}"/client


	if use nginx_modules_http_perl; then
		cd "${S}"/objs/src/http/modules/perl/
		einstall DESTDIR="${D%/}" INSTALLDIRS=vendor
		fixlocalpod
	fi



pkg_postinst() {
	if use ssl; then
		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
			install_cert /etc/ssl/${PN}/${PN}
			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
		fi
	fi


		ewarn "Check if this is correct for your setup before restarting nginx!"
		ewarn "This is a one-time change and will not happen on subsequent updates."
		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
	fi

	# If the nginx user can't change into or read the dir, display a warning.

Return to bug 522994

Lines 495-505 Link Here

(-)nginx-1.7.6.ebuild.ori (-12 / +12 lines)
495	--with-cc-opt="-I${EROOT}usr/include" \	495	--with-cc-opt="-I${EROOT}usr/include" \
496	--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \	496	--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
497	--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \	497	--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
498	--http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \	498	--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
499	--http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \	499	--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
500	--http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \	500	--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
501	--http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \	501	--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
502	--http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \	502	--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
503	${myconf} \|\| die "configure failed"	503	${myconf} \|\| die "configure failed"
504		504
505	# A purely cosmetic change that makes nginx -V more readable. This can be	505	# A purely cosmetic change that makes nginx -V more readable. This can be
Lines 517-525 Link Here
517	}	517	}
518		518
519	src_install() {	519	src_install() {
520	emake DESTDIR="${D}" install	520	emake DESTDIR="${D%/}" install
521		521
522	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf \|\| die	522	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf \|\| die
523		523
524	newinitd "${FILESDIR}"/nginx.initd-r2 nginx	524	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
525		525
Lines 530-536 Link Here
530		530
531	# just keepdir. do not copy the default htdocs files (bug #449136)	531	# just keepdir. do not copy the default htdocs files (bug #449136)
532	keepdir /var/www/localhost	532	keepdir /var/www/localhost
533	rm -rf "${D}"/usr/html \|\| die	533	rm -rf "${D}"usr/html \|\| die
534		534
535	# set up a list of directories to keep	535	# set up a list of directories to keep
536	local keepdir_list="${NGINX_HOME_TMP}"/client	536	local keepdir_list="${NGINX_HOME_TMP}"/client
Lines 555-561 Link Here
555		555
556	if use nginx_modules_http_perl; then	556	if use nginx_modules_http_perl; then
557	cd "${S}"/objs/src/http/modules/perl/	557	cd "${S}"/objs/src/http/modules/perl/
558	einstall DESTDIR="${D}" INSTALLDIRS=vendor	558	einstall DESTDIR="${D%/}" INSTALLDIRS=vendor
559	fixlocalpod	559	fixlocalpod
560	fi	560	fi
561		561
Lines 638-646 Link Here
638		638
639	pkg_postinst() {	639	pkg_postinst() {
640	if use ssl; then	640	if use ssl; then
641	if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then	641	if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
642	install_cert /etc/ssl/${PN}/${PN}	642	install_cert /etc/ssl/${PN}/${PN}
643	use prefix \|\| chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}	643	use prefix \|\| chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
644	fi	644	fi
645	fi	645	fi
646		646
Lines 666-672 Link Here
666	ewarn "Check if this is correct for your setup before restarting nginx!"	666	ewarn "Check if this is correct for your setup before restarting nginx!"
667	ewarn "This is a one-time change and will not happen on subsequent updates."	667	ewarn "This is a one-time change and will not happen on subsequent updates."
668	ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"	668	ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
669	chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}	669	chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
670	fi	670	fi
671		671
672	# If the nginx user can't change into or read the dir, display a warning.	672	# If the nginx user can't change into or read the dir, display a warning.