Permalink
Browse files

Merge pull request #1 from openshift/master

Update etherpad example w/ typeless gears + mongo changes
  • Loading branch information...
2 parents 126f5c6 + b634b86 commit 3a3567aed366c641e064792f34ba1f301fdea399 @wshearn committed Jan 2, 2013
Showing with 13 additions and 13 deletions.
  1. +6 −6 .openshift/action_hooks/deploy
  2. +1 −1 README.md
  3. +6 −6 settings.json
@@ -7,12 +7,12 @@ cp -v $OPENSHIFT_REPO_DIR/.openshift/mongodb_db.js $OPENSHIFT_REPO_DIR/node_modu
settingsfile=$OPENSHIFT_REPO_DIR/settings.json
-sed -i 's/OPENSHIFT_INTERNAL_IP/'$OPENSHIFT_INTERNAL_IP'/' $settingsfile
-sed -i 's/OPENSHIFT_INTERNAL_PORT/'$OPENSHIFT_INTERNAL_PORT'/' $settingsfile
-sed -i 's/OPENSHIFT_NOSQL_DB_USERNAME/'$OPENSHIFT_NOSQL_DB_USERNAME'/' $settingsfile
-sed -i 's/OPENSHIFT_NOSQL_DB_HOST/'$OPENSHIFT_NOSQL_DB_HOST'/' $settingsfile
-sed -i 's/OPENSHIFT_NOSQL_DB_PORT/'$OPENSHIFT_NOSQL_DB_PORT'/' $settingsfile
-sed -i 's/OPENSHIFT_NOSQL_DB_PASSWORD/'$OPENSHIFT_NOSQL_DB_PASSWORD'/' $settingsfile
+sed -i 's/OPENSHIFT_NODEJS_IP/'$OPENSHIFT_NODEJS_IP'/' $settingsfile
+sed -i 's/OPENSHIFT_NODEJS_PORT/'$OPENSHIFT_NODEJS_PORT'/' $settingsfile
+sed -i 's/OPENSHIFT_MONGODB_DB_USERNAME/'$OPENSHIFT_MONGODB_DB_USERNAME'/' $settingsfile
+sed -i 's/OPENSHIFT_MONGODB_DB_HOST/'$OPENSHIFT_MONGODB_DB_HOST'/' $settingsfile
+sed -i 's/OPENSHIFT_MONGODB_DB_PORT/'$OPENSHIFT_MONGODB_DB_PORT'/' $settingsfile
+sed -i 's/OPENSHIFT_MONGODB_DB_PASSWORD/'$OPENSHIFT_MONGODB_DB_PASSWORD'/' $settingsfile
sed -i 's/OPENSHIFT_APP_NAME/'$OPENSHIFT_APP_NAME'/' $settingsfile
# Set up the symbolic links needed for etherpad to work
View
@@ -21,7 +21,7 @@ you want)
Add MongoDB support to your application
- rhc app cartridge add -a etherpad -c mongodb-2.0
+ rhc app cartridge add -a etherpad -c mongodb-2.2
Add this upstream Etherpad repo
View
@@ -1,13 +1,13 @@
{
- "ip": "OPENSHIFT_INTERNAL_IP",
- "port" : "OPENSHIFT_INTERNAL_PORT",
+ "ip": "OPENSHIFT_NODEJS_IP",
+ "port" : "OPENSHIFT_NODEJS_PORT",
"dbType" : "mongodb",
"dbSettings" : {
- "user" : "OPENSHIFT_NOSQL_DB_USERNAME",
- "host" : "OPENSHIFT_NOSQL_DB_HOST",
- "port" : OPENSHIFT_NOSQL_DB_PORT,
- "password": "OPENSHIFT_NOSQL_DB_PASSWORD",
+ "user" : "OPENSHIFT_MONGODB_DB_USERNAME",
+ "host" : "OPENSHIFT_MONGODB_DB_HOST",
+ "port" : OPENSHIFT_MONGODB_DB_PORT,
+ "password": "OPENSHIFT_MONGODB_DB_PASSWORD",
"dbname": "OPENSHIFT_APP_NAME"
},

0 comments on commit 3a3567a

Please sign in to comment.