From 989424702b1f2a0e7937530f9964257bcdd60a2c Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@ubuntu.com>
Date: Tue, 30 Apr 2013 14:20:26 +0200
Subject: Readded mercurial dependency, added rewrite Apache module.

---
 INSTALL                 | 9 +++++----
 scripts/rhodecode-setup | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index aeada4f..29f68c2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,7 +15,7 @@ process.
 
 To use that script, these are the steps:
 
- * Edit the 'config/production.ini' file and change the following lines:
+ * Edit the 'config/production-0.ini' file and change the following lines:
 
     sqlalchemy.db1.url = postgresql://rhodecode:XXXX@localhost/rhodecode
     broker.password = XXXX
@@ -29,7 +29,7 @@ To use that script, these are the steps:
 
  * Run the following command:
 
-    python scripts/rhodecode-setup --rhodecode-config config/production.ini \
+    python scripts/rhodecode-setup --rhodecode-config config/production-0.ini \
     --rhodecode-admin-email $EMAIL --rhodecode-admin-pwd $ADMIN_PWD \
     --assume-yes --rabbitmq-pwd $RABBIT_PWD --postgres-role-pwd $DB_PWD \
     --apache-conf config/rhodecode
@@ -46,8 +46,9 @@ Dependencies
  * apache2
  * build-essential
  * git
- * mercurial (v2.4.1, not in Ubuntu repositories, need to install via pip)
+ * libapache2-mod-xsendfile
  * members
+ * mercurial
  * pgadmin3
  * postgresql-9.1
  * postgresql-server-dev-9.1
@@ -65,6 +66,7 @@ Dependencies
  * python-mailer
  * python-markdown
  * python-nose
+ * python-objgraph
  * python-pastescript
  * python-pip
  * python-psycopg2
@@ -72,7 +74,6 @@ Dependencies
  * python-webhelpers
  * python-webob
  * rabbitmq-server
- * waitress (v0.8.1, not in Ubuntu repositories, need to install via pip)
 
 The package git-core can also be installed via the Ubuntu Git Maintainers PPA
 that usually has more updated versions of git. The PPA is: ppa:git-core/ppa
diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index a38dba5..d62c8b6 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -31,7 +31,8 @@ REQUIRED_PACKAGES = ["python-pip", "python-webob", "python-bcrypt", "members",
                      "python-pastescript", "python-psycopg2", "python-nose",
                      "build-essential", "python-amqplib", "python-anyjson",
                      "python-mailer", "apache2", "git", "python-ldap",
-                     "python-objgraph", "libapache2-mod-xsendfile"]
+                     "python-objgraph", "libapache2-mod-xsendfile",
+                     "mercurial"]
 # Packages required for celery integration.
 CELERY_REQUIRED_PACKAGES = ["rabbitmq-server"]
 
@@ -88,7 +89,7 @@ RHODECODE_LOG_DIR = "/var/log/rhodecode"
 APACHE_DEFAULT_DIR = "/etc/apache2/sites-available/"
 # Default modules to enalbe in Apache
 APACHE_ENABLE_MODULES = ["proxy", "proxy_http", "expires", "headers", "ssl",
-                         "xsendfile", "proxy_balancer"]
+                         "xsendfile", "proxy_balancer", "rewrite"]
 # Apache websites to disable.
 APACHE_DISABLE_SITES = ["default"]
 # Chown script constants.
-- 
cgit v1.2.3