summaryrefslogtreecommitdiffstats
path: root/documentation/toaster-manual
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-07-12 10:33:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-19 15:04:50 +0100
commit3d24037b76c9c852b041b4b5870aa032c78c6ba8 (patch)
treefedefcf9e49ddf477e521bab6344977f35c8262c /documentation/toaster-manual
parentc3e076f555f787f071c66b3cfc3d3669bcb7791f (diff)
downloadpoky-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>
Diffstat (limited to 'documentation/toaster-manual')
-rw-r--r--documentation/toaster-manual/toaster-manual-setup-and-use.xml20
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 &lt;Directory /var/www/toaster/static_files&gt; 401 &lt;Directory /var/www/toaster/static_files&gt;
402 Order allow,deny 402 &lt;IfModule mod_access_compat.c&gt;
403 Allow from all 403 Order allow,deny
404 Require all granted 404 Allow from all
405 &lt;/IfModule&gt;
406 &lt;IfModule !mod_access_compat.c&gt;
407 Require all granted
408 &lt;/IfModule&gt;
405 &lt;/Directory&gt; 409 &lt;/Directory&gt;
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 &lt;Directory /var/www/toaster/poky/bitbake/lib/toaster/toastermain&gt;
412 &lt;Files "wsgi.py"&gt;
413 Require all granted
414 &lt;/Files&gt;
415 &lt;/Directory&gt;
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 &lt;Location /&gt; 420 &lt;Location /&gt;
411 WSGIProcessGroup toastern_wsgi 421 WSGIProcessGroup toaster_wsgi
412 &lt;/Location&gt; 422 &lt;/Location&gt;
413 </literallayout> 423 </literallayout>
414 If you are using Ubuntu or Debian, 424 If you are using Ubuntu or Debian,