diff --git a/heroku/index.js b/heroku/index.js index bd46a86a4..3c34f37b0 100644 --- a/heroku/index.js +++ b/heroku/index.js @@ -161,10 +161,6 @@ Generator.prototype.gitForcePush = function gitForcePush() { this.log(chalk.yellow('\nBecause you\'re using mongoose, you must add mongoDB to your heroku app.\n\t' + 'from `/dist`: ' + chalk.bold('heroku addons:add mongohq') + '\n')); hasWarning = true; } - if(this.filters.socketio) { - this.log(chalk.yellow('Because you\'re using socketIO, you must enable websockets on your heroku app.\n\t' + 'from `/dist`: ' + chalk.bold('heroku labs:enable websockets') + '\n')); - hasWarning = true; - } if(this.filters.facebookAuth) { this.log(chalk.yellow('You will need to set environment variables for facebook auth. From `/dist`:\n\t' + @@ -190,9 +186,8 @@ Generator.prototype.gitForcePush = function gitForcePush() { this.log(chalk.green('\nYou may need to address the issues mentioned above and restart the server for the app to work correctly.')); } - this.log(chalk.cyan('\nTo deploy a new build\n\t' + chalk.bold('grunt build') + - '\nThen enter the dist folder to commit these updates:\n\t' + chalk.bold('cd dist && git add -A && git commit -m "describe your changes here"'))); - this.log(chalk.cyan('Finally, deploy your updated build to Heroku with\n\t' + chalk.bold('git push -f heroku master'))); + this.log(chalk.yellow('After app modification run\n\t' + chalk.bold('grunt build') + + '\nThen deploy with\n\t' + chalk.bold('grunt buildcontrol:heroku'))); } done(); }.bind(this)); diff --git a/openshift/index.js b/openshift/index.js index f4bd7efce..518806b08 100644 --- a/openshift/index.js +++ b/openshift/index.js @@ -267,7 +267,7 @@ Generator.prototype.restartApp = function restartApp() { var hasWarning = false; var before_hostname = this.dist_repo_url.indexOf('@') + 1; var after_hostname = this.dist_repo_url.length - ( 'openshift'.length + 12 ); - host_url = 'http://' + this.dist_repo_url.slice(before_hostname, after_hostname); + host_url = 'http://' + this.dist_repo_url.slice(before_hostname, after_hostname) + 'com'; if(this.filters.facebookAuth) { this.log(chalk.yellow('You will need to set environment variables for facebook auth:\n\t' + @@ -294,7 +294,6 @@ Generator.prototype.restartApp = function restartApp() { 'rhc app-restart -a ' + this.deployedName)); } this.log(chalk.yellow('After app modification run\n\t' + chalk.bold('grunt build') + - '\nThen enter the dist folder to commit these updates:\n\t' + chalk.bold('cd dist && git add -A && git commit -m "describe your changes here"'))); - this.log(chalk.green('Finally, deploy your updated build to OpenShift with\n\t' + chalk.bold('git push -f '+'openshift'+' master'))); + '\nThen deploy with\n\t' + chalk.bold('grunt buildcontrol:openshift'))); }.bind(this)); }; diff --git a/readme.md b/readme.md index 92851db6b..8bc2dcaac 100644 --- a/readme.md +++ b/readme.md @@ -221,14 +221,6 @@ Deploying to OpenShift can be done in just a few steps: A live application URL will be available in the output. -> **Enabling web sockets** -> -> If you're using socket.io, you will need to update the client to connect to the correct port for sockets to work. -> -> In `/client/components/socket/socket.service` update the socket to connect to port 8000. (with `my-openshift-app` being the deployed name of your app): -> -> var ioSocket = io.connect('my-openshift-app.com:8000'); -> > **oAuth** > > If you're using any oAuth strategies, you must set environment variables for your selected oAuth. For example, if we're using Facebook oAuth we would do this : @@ -256,8 +248,7 @@ To make your deployment process easier consider using [grunt-build-control](http Commit and push the resulting build, located in your dist folder: - cd dist && git add -A && git commit -m "describe your changes here" - git push -f my-openshift-app master + grunt buildcontrol:openshift ### Heroku @@ -297,8 +288,7 @@ To make your deployment process easier consider using [grunt-build-control](http Commit and push the resulting build, located in your dist folder: - cd dist && git add -A && git commit -m "describe your changes here" - git push -f heroku master + grunt buildcontrol:heroku ## Bower Components