Changes between Version 8 and Version 9 of ProductieStappen

Timestamp:

01/14/15 15:42:58 (10 years ago)

Author:

mschenk

Comment:

—

ProductieStappen

@@ -37 +37 @@
 == NGINX ==
 
-Nginx provides a web-server that is used to serve static content and forward requests to the uwsgi servers running the actual website application
+Nginx provides a web-server that is used to serve static content and forward requests to the uwsgi servers running the actual website application.
+
+Nginx runs as a docker instance.
 
 Full nginx configuration can be found in [source:services/trunk/production/dex-app1/nginx]
@@ -43 +45 @@
 == UWSGI ==
 
-This container runs the actual website code. The current website code needs to be installed in /var/o2eappserver/fig/website. This directory is available as /code inside the docker image. (Further paths in this section will be specific to the docker instance)
+This container runs the actual website code as a docker container. The current website code needs to be installed in /var/o2eappserver/fig/website. This directory is available as /code inside the docker image. (Further paths in this section will be specific to the docker instance)
 
 The website as checked out from svn will not work properly due to missing settings. In order to create a working setup a settings_local.py file needs to be installed in /code/website/conf. The file [source:website/trunk/website/conf/production/settings_live.py] provides a template for this file
@@ -104 +106 @@
 = dex-content1 =
 
+This is the physical machine hosting the content server 
+
 == NGINX ==
 
-The media-serving capabilities are implemented entirely in the built-in webdav functionality of nginx. The only necessary configuration that is necessary is registration of the IP-addresses of the application servers. These IP-addresses are allowed to do write operations on the media-server. A template for the configuration file is given in [source:services/trunk/production/dex-content1/config/conf.d/webdav.conf]. The editable part is the access-list:
+The media-serving capabilities are implemented entirely in the built-in webdav functionality of nginx. 
+
+Nginx runs as a docker instance.
+
+The only necessary configuration that is necessary is registration of the IP-addresses of the application servers. These IP-addresses are allowed to do write operations on the media-server. A template for the configuration file is given in [source:services/trunk/production/dex-content1/config/conf.d/webdav.conf]. The editable part is the access-list:
 
 [[IncludeSource(services/trunk/production/dex-content1/config/conf.d/webdav.conf,start=21,end=26)]]
 
+= gatekeeper1 =
+
+On this physical machine the single-sign-on server is running
+
+== sso ==
+
+SSO runs as a docker container. Information is here: https://svn.3xo.tudelft.nl/trac/sso/browser/trunk/server/readme