diff options
| author |   Pascal Bach <pascal.bach@siemens.com> | 2016-02-04 16:03:13 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-15 10:21:34 +0100 |
| commit | f67d121f9f2bde198887da01e3673a18d0249a5c (patch) | |
| tree | 0d507d5277ff0862d5e9c10aeb82104eece4166d /meta-webserver | |
| parent | d74d33e1e403782a4840a62ecda5ad148e933dcd (diff) | |
| download | meta-openembedded-contrib-f67d121f9f2bde198887da01e3673a18d0249a5c.tar.gz | |
nginx: make nginx user and home directory configurable
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>
Diffstat (limited to 'meta-webserver')
| -rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx_1.9.9.bb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.9.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.9.bb index 06d61c769b..08f53a7d9b 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.9.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.9.bb @@ -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}" |