aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo@ubuntu.com>2013-02-06 15:50:42 +0100
committerMilo Casagrande <milo@ubuntu.com>2013-02-06 15:50:42 +0100
commit80f7efda8d32cbfdea147461bc1cd481d23073ef (patch)
tree9b394431c5c4006926dc8699b4f8a8f19bcd1e45
parent7564128555a1714911aee2e73a0da5184a4eb52e (diff)
downloadrhodecode-config-80f7efda8d32cbfdea147461bc1cd481d23073ef.tar.gz
Enabled beaker DB backend, fixed Apache configuration, updated INSTALL file.
-rw-r--r--INSTALL10
-rw-r--r--config/production.ini8
-rw-r--r--config/rhodecode23
3 files changed, 33 insertions, 8 deletions
diff --git a/INSTALL b/INSTALL
index 879c94b..ff4179b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -19,9 +19,14 @@ To use that script, these are the steps:
sqlalchemy.db1.url = postgresql://rhodecode:XXXX@localhost/rhodecode
broker.password = XXXX
+ beaker.session.sa.url = postgresql://rhodecode:XXXX@localhost/rhodecode
Change the 'XXXX' with appropriate passwords, that need to be passed on the
command line to run the script.
+
+ * Modify the file 'config/rhodecode' for Apache, adjusting the default or
+ empty values based on the installation environment.
+
* Run the following command:
python scripts/rhodecode-setup --rhodecode-config config/production.ini \
@@ -203,7 +208,8 @@ Apache Configuration
--------------------
In the 'config/' directory there is a working Apache configuration to serve
-RhodeCode on port 80.
+RhodeCode on port 80 and on 443 for HTTPS. Values need to be adjusted based on
+the installation environment.
To use that configuration it is necessary to enable two Apache modules:
@@ -258,6 +264,8 @@ To enable LDAP:
sudo apt-get install python-ldap
+ * Restart RhodeCode
+
* Login as admin to RhodeCode, and from the Admin menu choose LDAP
* LDAP configuration has to be done in there. For more info see:
diff --git a/config/production.ini b/config/production.ini
index 647399c..a00e5e2 100644
--- a/config/production.ini
+++ b/config/production.ini
@@ -198,9 +198,9 @@ beaker.cache.sql_cache_long.key_length = 256
## that is also used by the cache system.
## db session ##
-#beaker.session.type = ext:database
-#beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
-#beaker.session.table_name = db_session
+beaker.session.type = ext:database
+beaker.session.sa.url = postgresql://rhodecode:XXXX@localhost/rhodecode
+beaker.session.table_name = db_session
## encrypted cookie client side session, good for many instances ##
#beaker.session.type = cookie
@@ -214,7 +214,7 @@ beaker.session.key = rhodecode
#beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
#beaker.session.validate_key = 9712sds2212c--zxc123
## sets session as invalid if it haven't been accessed for given amount of time
-beaker.session.timeout = 2592000
+beaker.session.timeout = 648000
beaker.session.httponly = true
#beaker.session.cookie_path = /<your-prefix>
diff --git a/config/rhodecode b/config/rhodecode
index b4c22e4..648da96 100644
--- a/config/rhodecode
+++ b/config/rhodecode
@@ -1,6 +1,6 @@
<VirtualHost *:80>
- ServerName staging.git.linaro.org
- ServerAlias staging.git.linaro.org
+ ServerName XXXX
+ ServerAlias XXXX
<Proxy *>
Order allow,deny
@@ -9,11 +9,28 @@
Alias /git-ro/ /opt/rhodecode/git_repos/
Alias / /opt/rhodecode/git_repos/
+</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName XXXX
+ ServerAlias XXXX
+
+ SSLEngine On
+ SSLCertificateFile /etc/ssl/certs/XXXX
+ SSLCertificateKeyFile /etc/ssl/private/XXXX
- #Directive to properly generate url (clone url) for pylons
+ <Proxy *>
+ Order allow,deny
+ Allow from all
+ </Proxy>
+
+ # Directive to properly generate url (clone url) for pylons
ProxyPreserveHost On
#rhodecode instance
ProxyPass / http://127.0.0.1:5000/
ProxyPassReverse / http://127.0.0.1:5000/
+
+ # To enable https use line below
+ SetEnvIf X-Url-Scheme https HTTPS=1
</VirtualHost>