Typeless changes.

Author: mrunalp

.openshift/action_hooks/deploy

@@ -4,7 +4,8 @@
 # up again.  This script gets executed directly, so it could be python, php,
 # ruby, etc.
 
-source $OPENSHIFT_GEAR_DIR/virtenv/bin/activate
+cartridge_type="python-2.6"
+source $OPENSHIFT_HOMEDIR/$cartridge_type/virtenv/bin/activate
 
 if [ ! -f $OPENSHIFT_DATA_DIR/sqlite3.db ]
 then

README

@@ -21,17 +21,18 @@ OpenShift provides several environment variables to reference for ease
 of use.  The following list are some common variables but far from exhaustive:
 
     os.environ['OPENSHIFT_APP_NAME']  - Application name
-    os.environ['OPENSHIFT_GEAR_DIR']   - Application dir
     os.environ['OPENSHIFT_DATA_DIR']  - For persistent storage (between pushes)
     os.environ['OPENSHIFT_TMP_DIR']   - Temp storage (unmodified files deleted after 10 days)
 
 When embedding a database using 'rhc app cartridge add', you can reference environment
 variables for username, host and password:
 
-    os.environ['OPENSHIFT_DB_HOST']      - DB host
-    os.environ['OPENSHIFT_DB_PORT']      - DB Port
-    os.environ['OPENSHIFT_DB_USERNAME']  - DB Username
-    os.environ['OPENSHIFT_DB_PASSWORD']  - DB Password
+If you embed MySQL, then:
+
+    os.environ['OPENSHIFT_MYSQL_DB_HOST']      - DB host
+    os.environ['OPENSHIFT_MYSQL_DB_PORT']      - DB Port
+    os.environ['OPENSHIFT_MYSQL_DB_USERNAME']  - DB Username
+    os.environ['OPENSHIFT_MYSQL_DB_PASSWORD']  - DB Password
 
 To get a full list of environment variables, simply add a line in your
 .openshift/action_hooks/build script that says "export" and push.

wsgi/openshift/settings.py

@@ -18,7 +18,7 @@
 MANAGERS = ADMINS
 
 if ON_OPENSHIFT:
-    # os.environ['OPENSHIFT_DB_*'] variables can be used with databases created
+    # os.environ['OPENSHIFT_MYSQL_DB_*'] variables can be used with databases created
     # with rhc app cartridge add (see /README in this git repo)
     DATABASES = {
         'default': {