kallithea: docs/setup.rst comparison

comparison docs/setup.rst @ 3960:5293d4bbb1ea

Merged dev into stable/default/master branch

author	Marcin Kuzminski <marcin@python-works.com>
date	Fri, 07 Jun 2013 00:31:11 +0200
parents	3563bb7b4b82 a5bccf34c512
children	2c82dd8ba318

comparison

equal deleted inserted replaced

-:51596d9ef2f8
+:5293d4bbb1ea
 Login Attribute      = uid
 First Name Attribute = firstName
 Last Name Attribute  = lastName
 E-mail Attribute     = mail
+If your user groups are placed in a Organisation Unit (OU) structure the Search Settings configuration differs::
+Search settings
+Base DN              = DC=host,DC=example,DC=org
+LDAP Filter          = (&(memberOf=CN=your user group,OU=subunit,OU=unit,DC=host,DC=example,DC=org)(objectClass=user))
+LDAP Search Scope    = SUBTREE
 .. _enable_ldap:
 Enable LDAP : required
 Whether to use LDAP for authenticating users.
 RhodeCode provides a simple integration with issue trackers. It's possible
 to define a regular expression that will fetch issue id stored in commit
 messages and replace that with an url to this issue. To enable this simply
 uncomment following variables in the ini file::
-url_pat = (?:^#|\s#)(\w+)
+issue_pat = (?:^#|\s#)(\w+)
 issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 issue_prefix = #
-`url_pat` is the regular expression that will fetch issues from commit messages.
+`issue_pat` is the regular expression that will fetch issues from commit messages.
 Default regex will match issues in format of #<number> eg. #300.
 Matched issues will be replace with the link specified as `issue_server_link`
 {id} will be replaced with issue id, and {repo} with repository name.
 Since the # is striped `issue_prefix` is added as a prefix to url.
 # add more instances for load balancing
 #server 127.0.0.1:5001;
 #server 127.0.0.1:5002;
 }
+## gist alias
+server {
+listen          443;
+server_name     gist.myserver.com;
+access_log      /var/log/nginx/gist.access.log;
+error_log       /var/log/nginx/gist.error.log;
+ssl on;
+ssl_certificate     gist.rhodecode.myserver.com.crt;
+ssl_certificate_key gist.rhodecode.myserver.com.key;
+ssl_session_timeout 5m;
+ssl_protocols SSLv3 TLSv1;
+ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
+ssl_prefer_server_ciphers on;
+rewrite ^/(.+)$ https://rhodecode.myserver.com/_admin/gists/$1;
+rewrite (.*)    https://rhodecode.myserver.com/_admin/gists;
+}
 server {
 listen          443;
 server_name     rhodecode.myserver.com;
 access_log      /var/log/nginx/rhodecode.access.log;
 error_log       /var/log/nginx/rhodecode.error.log;
 ssl_protocols SSLv3 TLSv1;
 ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
 ssl_prefer_server_ciphers on;
-# uncomment if you have nginx with chunking module compiled
+## uncomment root directive if you want to serve static files by nginx
-# fixes the issues of having to put postBuffer data for large git
+## requires static_files = false in .ini file
-# pushes
-#chunkin on;
-#error_page 411 = @my_411_error;
-#location @my_411_error {
-#    chunkin_resume;
-#}
-# uncomment if you want to serve static files by nginx
 #root /path/to/installation/rhodecode/public;
+include         /etc/nginx/proxy.conf;
 location / {
 try_files $uri @rhode;
 }
 location @rhode {
 proxy_pass      http://rc;
-include         /etc/nginx/proxy.conf;
 }
 }
 Here's the proxy.conf. It's tuned so it will not timeout on long
 proxy_set_header            X-Url-Scheme $scheme;
 proxy_set_header            X-Host $http_host;
 proxy_set_header            X-Real-IP $remote_addr;
 proxy_set_header            X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_set_header            Proxy-host $proxy_host;
-client_max_body_size        400m;
-client_body_buffer_size     128k;
 proxy_buffering             off;
 proxy_connect_timeout       7200;
 proxy_send_timeout          7200;
 proxy_read_timeout          7200;
 proxy_buffers               8 32k;
+client_max_body_size        1024m;
-Also, when using root path with nginx you might set the static files to false
+client_body_buffer_size     128k;
-in the production.ini file::
+large_client_header_buffers 8 64k;
-[app:main]
-use = egg:rhodecode
-full_stack = true
-static_files = false
-lang=en
-cache_dir = %(here)s/data
-In order to not have the statics served by the application. This improves speed.
 Apache virtual host reverse proxy example
 -----------------------------------------

Mercurial > kallithea

comparison docs/setup.rst @ 3960:5293d4bbb1ea