CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nginx: make nginx user and home directory configurable

Browse Source 
This allows selecting a different user then "www" in a bbappend.
It also allows to change the default value of "/var/www/localhost" to something else.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Pascal Bach 2016-02-04 16:03:13 +01:00 committed by Martin Jansa
parent d74d33e1e4
commit f67d121f9f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta-webserver/recipes-httpd/nginx/nginx_1.9.9.bb
View File

@ -27,6 +27,9 @@ inherit update-rc.d useradd
CFLAGS_append = " -fPIE -pie"
CXXFLAGS_append = " -fPIE -pie"
NGINX_WWWDIR ?= "${localstatedir}/www/localhost"
NGINX_USER ?= "www"
EXTRA_OECONF = ""
do_configure () {
@ -71,9 +74,9 @@ do_install () {
fi
install -d ${D}${sysconfdir}/${BPN}
ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
install -d ${D}${localstatedir}/www/localhost
mv ${D}/usr/html ${D}${localstatedir}/www/localhost/
chown www:www-data -R ${D}${localstatedir}
install -d ${D}${NGINX_WWWDIR}
mv ${D}/usr/html ${D}${NGINX_WWWDIR}/
chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR}
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx
@ -130,6 +133,6 @@ INITSCRIPT_PARAMS = "defaults 92 20"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = " \
--system --no-create-home \
--home ${localstatedir}/www/localhost \
--home ${NGINX_WWWDIR} \
--groups www-data \
--user-group www"
--user-group ${NGINX_USER}"