Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1 from ramr/master

Updates to use package.json + minor cleanup
  • Loading branch information...
commit 16953bd3899da989465efad76a1750252c4d4359 2 parents 13c5563 + a7a50b4
@gshipley gshipley authored
Showing with 29 additions and 38 deletions.
  1. +1 −1  .openshift/action_hooks/deploy
  2. +21 −16 README.md
  3. +7 −21 deplist.txt
View
2  .openshift/action_hooks/deploy
@@ -3,7 +3,7 @@
# build hook has been run but before the application has been started back
# up again. This script gets executed directly, so it could be python, php,
# ruby, etc.
-cp -v $OPENSHIFT_REPO_DIR/.openshift/mongodb_db.js $OPENSHIFT_GEAR_DIR/node_modules/ueberDB/
+cp -v $OPENSHIFT_REPO_DIR/.openshift/mongodb_db.js $OPENSHIFT_REPO_DIR/node_modules/ueberDB/
settingsfile=$OPENSHIFT_REPO_DIR/settings.json
View
37 README.md
@@ -1,11 +1,12 @@
Etherpad on OpenShift
=====================
-This git repository helps you get up and running quickly w/ a Etherpad installation
-on OpenShift. The backend database is MongoDB and the database name is the
-same as your application name (using $_ENV['OPENSHIFT_APP_NAME']). You can name
-your application whatever you want. However, the name of the database will always
-match the application so you might have to update .openshift/action_hooks/build.
+This git repository helps you get up and running quickly w/ a Etherpad
+installation on OpenShift. The backend database is MongoDB and the database
+name is the same as your application name (using $_ENV['OPENSHIFT_APP_NAME']).
+You can name your application whatever you want. However, the name of the
+database will always match the application so you might have to update
+.openshift/action_hooks/build.
Running on OpenShift
@@ -13,7 +14,8 @@ Running on OpenShift
Create an account at http://openshift.redhat.com/
-Create a nodejs-0.6 application (you can call your application whatever you want)
+Create a nodejs-0.6 application (you can call your application whatever
+you want)
rhc app create -a etherpad -t nodejs-0.6
@@ -24,15 +26,17 @@ Add MongoDB support to your application
Add this upstream Etherpad repo
cd etherpad
- git remote add upstream -m master git://github.com/wshearn/etherpad-example.git
+ git remote add upstream -m master git://github.com/openshift/etherpad-example.git
git pull -s recursive -X theirs upstream master
- # note that the git pull above can be used later to pull updates to Etherpad
- # the rm and ln is there until I can figure out github and symbolic links
+ # note that the git pull above can be used later to pull updates to
+ # Etherpad the rm and ln is there until I can figure out github and
+ # symbolic links
Then push the repo upstream
git push
-That's it, you can now checkout your application at (default admin account is admin/OpenShiftAdmin):
+That's it, you can now checkout your application at (default admin account
+is admin/OpenShiftAdmin):
http://etherpad-$yournamespace.rhcloud.com
@@ -40,11 +44,12 @@ That's it, you can now checkout your application at (default admin account is ad
NOTES:
GIT_ROOT/.openshift/action_hooks/deploy:
- This script is executed with every 'git push'. Feel free to modify this script
- to learn how to use it to your advantage. By default, this script will create
- the database tables that this example uses.
+ This script is executed with every 'git push'. Feel free to modify
+ this script to learn how to use it to your advantage. By default,
+ this script will create the database tables that this example uses.
git push warnings:
- You can safely ignore these. However if they really annoy you, you can edit
- settings.json and replace the database settings with your own. Then edit
- .openshift/action_hooks/deploy and remove the sed statements.
+ You can safely ignore these. However if they really annoy you, you can
+ edit settings.json and replace the database settings with your own.
+ Then edit .openshift/action_hooks/deploy and remove the sed statements.
+
View
28 deplist.txt
@@ -1,27 +1,13 @@
#
-# This file contains a list of Node modules and optionally version
-# (one per line) of the form: <module-name>@<version>
-# to install alongside your app ("locally") on the OpenShift environment.
+# ***************************************************************************
+#
+# Note: This file has been deprecated and exists for backward compatibility.
+# Please use package.json to add dependencies to the Node modules
+# your application requires.
+#
+# ***************************************************************************
#
-
-# Any blank lines or lines starting with a hash (#) are ignored.
-# E.g. uncomment the next line to install sqlite3
-#sqlite3
#
# For a list of globally installed modules - see file: npm_global_module_list.
#
-# Note: You can override a globally available module by specifying it in this
-# file or packaging it in the node_modules/ directory. Node will give
-# preference to the "locally" installed version of that module.
-#
-async-stacktrace
-log4js
-socket.io
-formidable
-ueberDB
-clean-css
-uglify-js
-require-kernel@1.0.3
-jsdom-nocontextifiy
-mongodb
Please sign in to comment.
Something went wrong with that request. Please try again.