diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/nginx/nginx.inc')
-rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 83ae90c40c..2714c3d22f 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc | |||
@@ -108,24 +108,24 @@ do_install () { | |||
108 | chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} | 108 | chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} |
109 | 109 | ||
110 | install -d ${D}${sysconfdir}/init.d | 110 | install -d ${D}${sysconfdir}/init.d |
111 | install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx | 111 | install -m 0755 ${UNPACKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx |
112 | sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx | 112 | sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx |
113 | sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx | 113 | sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx |
114 | 114 | ||
115 | install -d ${D}${sysconfdir}/nginx | 115 | install -d ${D}${sysconfdir}/nginx |
116 | install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf | 116 | install -m 0644 ${UNPACKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf |
117 | sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/nginx/nginx.conf | 117 | sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/nginx/nginx.conf |
118 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf | 118 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf |
119 | sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf | 119 | sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf |
120 | install -Dm 0644 ${WORKDIR}/default_server.site ${D}${sysconfdir}/nginx/sites-available/default_server | 120 | install -Dm 0644 ${UNPACKDIR}/default_server.site ${D}${sysconfdir}/nginx/sites-available/default_server |
121 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/sites-available/default_server | 121 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/sites-available/default_server |
122 | install -d ${D}${sysconfdir}/nginx/sites-enabled | 122 | install -d ${D}${sysconfdir}/nginx/sites-enabled |
123 | ln -s ../sites-available/default_server ${D}${sysconfdir}/nginx/sites-enabled/ | 123 | ln -s ../sites-available/default_server ${D}${sysconfdir}/nginx/sites-enabled/ |
124 | 124 | ||
125 | install -m 0644 ${WORKDIR}/proxy_params ${D}${sysconfdir}/nginx/proxy_params | 125 | install -m 0644 ${UNPACKDIR}/proxy_params ${D}${sysconfdir}/nginx/proxy_params |
126 | 126 | ||
127 | install -d ${D}${sysconfdir}/default/volatiles | 127 | install -d ${D}${sysconfdir}/default/volatiles |
128 | install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx | 128 | install -m 0644 ${UNPACKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx |
129 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx | 129 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx |
130 | sed -i 's,@NGINX_USER@,${NGINX_USER},g' ${D}${sysconfdir}/default/volatiles/99_nginx | 130 | sed -i 's,@NGINX_USER@,${NGINX_USER},g' ${D}${sysconfdir}/default/volatiles/99_nginx |
131 | 131 | ||
@@ -140,7 +140,7 @@ do_install () { | |||
140 | 140 | ||
141 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then | 141 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then |
142 | install -d ${D}${systemd_unitdir}/system | 142 | install -d ${D}${systemd_unitdir}/system |
143 | install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ | 143 | install -m 0644 ${UNPACKDIR}/nginx.service ${D}${systemd_unitdir}/system/ |
144 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 144 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
145 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ | 145 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ |
146 | -e 's,@SBINDIR@,${sbindir},g' \ | 146 | -e 's,@SBINDIR@,${sbindir},g' \ |