diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-07-12 10:33:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-19 15:04:50 +0100 |
commit | 3d24037b76c9c852b041b4b5870aa032c78c6ba8 (patch) | |
tree | fedefcf9e49ddf477e521bab6344977f35c8262c | |
parent | c3e076f555f787f071c66b3cfc3d3669bcb7791f (diff) | |
download | poky-3d24037b76c9c852b041b4b5870aa032c78c6ba8.tar.gz |
toaster-manual: update apache configuration file
Changed access control instructions to work with Apache 2.4 according
to https://httpd.apache.org/docs/current/upgrading.html.
Added 'Require all granted' for wsgi.py according to
https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/modwsgi/.
Changed python module path for WSGIDaemonProcess as python version
changed and modules are installed to the different path.
(From yocto-docs rev: 503b6c3c250936e889ce146bfcd301ed55e638d2)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/toaster-manual/toaster-manual-setup-and-use.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml index 8959b401b6..b3609c8954 100644 --- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml +++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml | |||
@@ -399,16 +399,26 @@ | |||
399 | <literallayout class='monospaced'> | 399 | <literallayout class='monospaced'> |
400 | Alias /static /var/www/toaster/static_files | 400 | Alias /static /var/www/toaster/static_files |
401 | <Directory /var/www/toaster/static_files> | 401 | <Directory /var/www/toaster/static_files> |
402 | Order allow,deny | 402 | <IfModule mod_access_compat.c> |
403 | Allow from all | 403 | Order allow,deny |
404 | Require all granted | 404 | Allow from all |
405 | </IfModule> | ||
406 | <IfModule !mod_access_compat.c> | ||
407 | Require all granted | ||
408 | </IfModule> | ||
405 | </Directory> | 409 | </Directory> |
406 | 410 | ||
407 | WSGIDaemonProcess toaster_wsgi python-path=/var/www/toaster/poky/bitbake/lib/toaster:/var/www/toaster/venv/lib/python2.7/site-packages | 411 | <Directory /var/www/toaster/poky/bitbake/lib/toaster/toastermain> |
412 | <Files "wsgi.py"> | ||
413 | Require all granted | ||
414 | </Files> | ||
415 | </Directory> | ||
416 | |||
417 | WSGIDaemonProcess toaster_wsgi python-path=/var/www/toaster/poky/bitbake/lib/toaster:/var/www/toaster/.local/lib/python3.4/site-packages | ||
408 | 418 | ||
409 | WSGIScriptAlias / "/var/www/toaster/poky/bitbake/lib/toaster/toastermain/wsgi.py" | 419 | WSGIScriptAlias / "/var/www/toaster/poky/bitbake/lib/toaster/toastermain/wsgi.py" |
410 | <Location /> | 420 | <Location /> |
411 | WSGIProcessGroup toastern_wsgi | 421 | WSGIProcessGroup toaster_wsgi |
412 | </Location> | 422 | </Location> |
413 | </literallayout> | 423 | </literallayout> |
414 | If you are using Ubuntu or Debian, | 424 | If you are using Ubuntu or Debian, |