From 76c351aea2c5f0bba70f5a896c079031102b961d Mon Sep 17 00:00:00 2001 From: jamesmacfie8i Date: Thu, 6 Oct 2016 21:16:30 +1300 Subject: [PATCH 1/3] Test --- build/.gitkeep | 1 - build/README | 4 --- config/development/mup.json | 66 +++++++++++++++++----------------- config/production/mup.json | 70 ++++++++++++++++++------------------- 4 files changed, 66 insertions(+), 75 deletions(-) delete mode 100644 build/.gitkeep delete mode 100644 build/README diff --git a/build/.gitkeep b/build/.gitkeep deleted file mode 100644 index 8b13789..0000000 --- a/build/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/build/README b/build/README deleted file mode 100644 index 003af16..0000000 --- a/build/README +++ /dev/null @@ -1,4 +0,0 @@ -Application production builds can go in this directory. To build your -application for staging or production run this command: - -> iron build diff --git a/config/development/mup.json b/config/development/mup.json index 1586282..07c55ca 100644 --- a/config/development/mup.json +++ b/config/development/mup.json @@ -1,42 +1,40 @@ { - // Server authentication info - "servers": [ - { - "host": "128.199.211.15", - "username": "avwave", - // or pem file (ssh based authentication) - // WARNING: Keys protected by a passphrase are not supported - "pem": "~/.ssh/id_rsa", - // Also, for non-standard ssh port use this - //"sshOptions": { "port" : 49154 }, - // server specific environment variables - "env": {} - } - ], + // Server authentication info + "servers": [{ + "host": "jsnz.herokuapp.com", + "username": "jamesmacfie", + // or pem file (ssh based authentication) + // WARNING: Keys protected by a passphrase are not supported + "pem": "~/.ssh/id_rsa", + // Also, for non-standard ssh port use this + //"sshOptions": { "port" : 49154 }, + // server specific environment variables + "env": {} + }], - // Install MongoDB on the server. Does not destroy the local MongoDB on future setups - "setupMongo": true, + // Install MongoDB on the server. Does not destroy the local MongoDB on future setups + "setupMongo": true, - // Application name (no spaces). - "appName": "javascriptnz", + // Application name (no spaces). + "appName": "jsnz", - // Location of app (local directory). This can reference '~' as the users home directory. - // i.e., "app": "~/Meteor/my-app", - // This is the same as the line below. - "app": "../../app", + // Location of app (local directory). This can reference '~' as the users home directory. + // i.e., "app": "~/Meteor/my-app", + // This is the same as the line below. + "app": "../../app", - // Configure environment - // ROOT_URL must be set to your correct domain (https or http) - "env": { - "PORT": 8137, - "ROOT_URL": "http://js.staging.veb.nz" - }, + // Configure environment + // ROOT_URL must be set to your correct domain (https or http) + "env": { + "PORT": 8137, + "ROOT_URL": "http://jsnz.herokuapp.com" + }, - // Meteor Up checks if the app comes online just after the deployment. - // Before mup checks that, it will wait for the number of seconds configured below. - "deployCheckWaitTime": 60, + // Meteor Up checks if the app comes online just after the deployment. + // Before mup checks that, it will wait for the number of seconds configured below. + "deployCheckWaitTime": 60, - // show a progress bar while uploading. - // Make it false when you deploy using a CI box. - "enableUploadProgressBar": true + // show a progress bar while uploading. + // Make it false when you deploy using a CI box. + "enableUploadProgressBar": true } diff --git a/config/production/mup.json b/config/production/mup.json index f6123fe..05cd349 100644 --- a/config/production/mup.json +++ b/config/production/mup.json @@ -1,43 +1,41 @@ { - // Server authentication info - "servers": [ - { - "host": "hostname", - "username": "root", - "password": "password", - // or pem file (ssh based authentication) - // WARNING: Keys protected by a passphrase are not supported - //"pem": "~/.ssh/id_rsa" - // Also, for non-standard ssh port use this - //"sshOptions": { "port" : 49154 }, - // server specific environment variables - "env": {} - } - ], + // Server authentication info + "servers": [{ + "host": "jsnz.herokuapp.com", + "username": "jamesmacfie", + // or pem file (ssh based authentication) + // WARNING: Keys protected by a passphrase are not supported + "pem": "~/.ssh/id_rsa", + // Also, for non-standard ssh port use this + //"sshOptions": { "port" : 49154 }, + // server specific environment variables + "env": {} + }], - // Install MongoDB on the server. Does not destroy the local MongoDB on future setups - "setupMongo": true, - // Application name (no spaces). - "appName": "javascriptnz", + // Install MongoDB on the server. Does not destroy the local MongoDB on future setups + "setupMongo": true, - // Location of app (local directory). This can reference '~' as the users home directory. - // i.e., "app": "~/Meteor/my-app", - // This is the same as the line below. - "app": "../../app", + // Application name (no spaces). + "appName": "jsnz", - // Configure environment - // ROOT_URL must be set to your correct domain (https or http) - "env": { - "PORT": 80, - "ROOT_URL": "http://myapp.com" - }, + // Location of app (local directory). This can reference '~' as the users home directory. + // i.e., "app": "~/Meteor/my-app", + // This is the same as the line below. + "app": "../../app", - // Meteor Up checks if the app comes online just after the deployment. - // Before mup checks that, it will wait for the number of seconds configured below. - "deployCheckWaitTime": 15, + // Configure environment + // ROOT_URL must be set to your correct domain (https or http) + "env": { + "PORT": 80, + "ROOT_URL": "http://jsnz.herokuapp.com" + }, - // show a progress bar while uploading. - // Make it false when you deploy using a CI box. - "enableUploadProgressBar": false -} + // Meteor Up checks if the app comes online just after the deployment. + // Before mup checks that, it will wait for the number of seconds configured below. + "deployCheckWaitTime": 15, + + // show a progress bar while uploading. + // Make it false when you deploy using a CI box. + "enableUploadProgressBar": false +} \ No newline at end of file From e37a93e9cf5cdce0ab90a6da162ecb8e007486a6 Mon Sep 17 00:00:00 2001 From: jamesmacfie8i Date: Fri, 7 Oct 2016 07:18:55 +1300 Subject: [PATCH 2/3] Remvoe cloudinary --- config/development/settings.json | 18 +----------------- config/production/settings.json | 17 ++--------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/config/development/settings.json b/config/development/settings.json index a7d297d..0db3279 100644 --- a/config/development/settings.json +++ b/config/development/settings.json @@ -1,19 +1,3 @@ { - "public": { - "cloudinary": { - "cloud_name": "avwave", - "folder": "" - } - }, - "private": { - "cloudinary": { - "cloud_name": "avwave", - "api_key": "364245231393934", - "api_secret": "3jFSPmmbQ7bGuNWZyZi0vDlFk6Q", - "folder": "" - }, - "recaptcha": { - "privatekey": "6LfdXh0TAAAAACrAMlvX80lVdHQbk_TFY5HhXZ4x" - } - } + } diff --git a/config/production/settings.json b/config/production/settings.json index 5e8171a..0e0dcd2 100644 --- a/config/production/settings.json +++ b/config/production/settings.json @@ -1,16 +1,3 @@ { - "public": { - "cloudinary": { - "cloud_name": "avwave", - "folder": "" - } - }, - "private": { - "cloudinary": { - "cloud_name": "avwave", - "api_key": "364245231393934", - "api_secret": "3jFSPmmbQ7bGuNWZyZi0vDlFk6Q", - "folder": "" - } - } -} + +} \ No newline at end of file From df7191b621d4e9140b4cd63491b01ceee639c7b6 Mon Sep 17 00:00:00 2001 From: jamesmacfie8i Date: Fri, 7 Oct 2016 07:23:42 +1300 Subject: [PATCH 3/3] asdf --- config/development/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/development/settings.json b/config/development/settings.json index 0db3279..0e0dcd2 100644 --- a/config/development/settings.json +++ b/config/development/settings.json @@ -1,3 +1,3 @@ { -} +} \ No newline at end of file