Permalink
Browse files

update to 0.5.0 plugins and update config/deploy.js

  • Loading branch information...
ghedamat committed Aug 11, 2015
1 parent 048ac0b commit ad74274839a30641a5d4612a790eb8ab8007d80f
@@ -0,0 +1,6 @@
SSH_USERNAME=XXX
SSH_KEY_PATH=~/.ssh/id_rsa
REDIS_HOST=XXX
REDIS_PORT=50000
AWS_ACCESS_KEY=XXX
AWS_SECRET_KEY=XXX

This file was deleted.

Oops, something went wrong.
@@ -15,4 +15,4 @@
/libpeerconnection.log
npm-debug.log
testem.log
.env
.env.deploy.production
@@ -1,48 +1,69 @@
require('dotenv').load();
module.exports = {
development: {
buildEnv: 'development',
store: {
type: 'redis', // this can be omitted because it is the default
host: 'localhost',
port: 6379
}
},
module.exports = function(deployTarget) {
var ENV = {};

if (deployTarget === 'development-postbuild') {
ENV.plugins = ['redis'];

staging: {
buildEnv: 'staging', // Override the environment passed to the ember asset build. Defaults to 'production'
store: {
type: 'redis',
ENV.build = {
environment: 'development'
};

ENV.redis = {
keyPrefix: 'edd-cli',
revisionKey: '__development__',
allowOverwrite: true,
host: 'localhost', // this can be omitted because it is the default
port: 6379, // this can be omitted because it is the default
distDir: function(context) {
return context.commandOptions.buildDir;
}
};
}

if (deployTarget === 'staging') {
ENV.build = {
environment: 'staging',
};
// configure other plugins for staging deploy target here
ENV.redis = {
allowOverwrite: true,
host: process.env['STAGING_HOST'],
port: process.env['STAGING_PORT'],
ssh: {
username: process.env['STAGING_USERNAME'],
privateKey: process.env['STAGING_KEY_PATH']
}
},
assets: {
};
ENV.s3 = {
accessKeyId: process.env['AWS_ACCESS_KEY'],
secretAccessKey: process.env['AWS_SECRET_KEY'],
bucket: 'edd-staging'
}
},

production: {
buildEnv: 'production', // Override the environment passed to the ember asset build. Defaults to 'production'
store: {
type: 'redis',
host: process.env['PRODUCTION_HOST'],
port: process.env['PRODUCTION_PORT'],
ssh: {
username: process.env['PRODUCTION_USERNAME'],
privateKey: process.env['PRODUCTION_KEY_PATH']
}
},
assets: {
};
}

if (deployTarget === 'production') {
ENV.build = {
environment: 'production',
};
// configure other plugins for production deploy target here
//
ENV['ssh-tunnel'] = {
username: process.env['SSH_USERNAME'],
host: process.env['REDIS_HOST'],
srcPort: process.env['REDIS_PORT']
};

ENV.redis = {
allowOverwrite: true,
host: 'localhost',
port: process.env['REDIS_PORT']
};
ENV.s3 = {
accessKeyId: process.env['AWS_ACCESS_KEY'],
secretAccessKey: process.env['AWS_SECRET_KEY'],
bucket: 'edd-production'
}

}

// Note: if you need to build some configuration asynchronously,ou can return
// a promise that resolves with the ENV object instead of returning the
// ENV object synchronously.
return ENV;

};
@@ -24,7 +24,10 @@ module.exports = function(defaults) {

var app = new EmberApp(defaults, {
fingerprint: fingerprintOptions,

emberCLIDeploy: {
runOnPostBuild: (env === 'development') ? 'development-postbuild' : false,
shouldActivate: true
},
sourcemaps: {
enabled: !isProductionLikeBuild,
},
@@ -19,18 +19,19 @@
"author": "",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"broccoli-asset-rev": "2.0.6",
"broccoli-sass": "^0.6.6",
"connect-restreamer": "^1.0.2",
"cors": "^2.7.1",
"dotenv": "^1.1.0",
"ember-cli": "1.13.7",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.4.0",
"ember-cli-babel": "^5.0.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.0.0",
"ember-cli-deploy": "^0.4.1",
"ember-cli-redis-proxy": "^0.2.0",
"ember-cli-deploy": "0.5.0-beta.3",
"ember-cli-deploy-lightning-pack": "0.2.0-beta.6",
"ember-cli-deploy-ssh-tunnel": "0.1.0",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-htmlbars-inline-precompile": "^0.1.1",
"ember-cli-ic-ajax": "0.2.1",
@@ -39,11 +40,9 @@
"ember-cli-release": "0.2.3",
"ember-cli-sri": "^1.0.1",
"ember-cli-uglify": "^1.0.1",
"ember-deploy-redis": "0.0.7",
"ember-deploy-s3": "0.0.5",
"ember-data": "1.13.7",
"ember-disable-proxy-controllers": "^1.0.0",
"liquid-fire": "0.21.2",
"ember-export-application-global": "^1.0.3"
"ember-export-application-global": "^1.0.3",
"liquid-fire": "0.21.2"
}
}
@@ -4,9 +4,9 @@ def index
index_key = if Rails.env.development?
'edd-cli:__development__'
elsif fetch_revision
"edd-cli:#{fetch_revision}"
"edd-cli:index:#{fetch_revision}"
else
Sidekiq.redis { |r| r.get('edd-cli:current') }
Sidekiq.redis { |r| "edd-cli:index:#{r.get('edd-cli:index:current')}" }
end
index = Sidekiq.redis { |r| r.get(index_key) }
render text: add_token_to_index(index), layout: false

0 comments on commit ad74274

Please sign in to comment.