From e836413cac26e78d0dfbd4c0a1586d07949d007d Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Thu, 21 Nov 2013 16:51:18 +0100 Subject: [PATCH 01/19] Create Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..e782f04 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: nodemon -e js,hbs,json src/api/server.js From be2e6795e1ee3987678fe92687a81c77c8f6f4ad Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sat, 23 Nov 2013 23:51:46 +0100 Subject: [PATCH 02/19] Essai de modifier le lancement --- Procfile | 2 +- Procfile.orig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Procfile.orig diff --git a/Procfile b/Procfile index e782f04..68e321e 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: nodemon -e js,hbs,json src/api/server.js +web: nodejs -e js,hbs,json src/api/server.js diff --git a/Procfile.orig b/Procfile.orig new file mode 100644 index 0000000..e782f04 --- /dev/null +++ b/Procfile.orig @@ -0,0 +1 @@ +web: nodemon -e js,hbs,json src/api/server.js From 283ecce2a89d9a94f44fe3a2cffa08562bc11f69 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 00:11:10 +0100 Subject: [PATCH 03/19] =?UTF-8?q?Correction=20des=20d=C3=A9pendances?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 042386c..4011ce2 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,11 @@ "url": "git://github.com/bjnortier/shapesmith.next.git" }, "contributors": [], - "engines": [ - "node" - ], + "engines": { + "node": "0.10.x", + "npm": "1.2.x" + } +, "scripts": { "test": "grunt test", "start": "nodemon -e js,hbs,json src/api/server.js" From 5020b2ff14ffa71f6b32d6b9dde63d8954c5d9e7 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 16:46:09 +0100 Subject: [PATCH 04/19] modification lancement --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 68e321e..8c3fc85 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: nodejs -e js,hbs,json src/api/server.js +web: node -e js,hbs,json src/api/server.js From 64d846fc01829ae39e9f1bb6d18188666de4064b Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 16:50:11 +0100 Subject: [PATCH 05/19] suppression de parametres --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 8c3fc85..60c33f0 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: node -e js,hbs,json src/api/server.js +web: node src/api/server.js From 346e0bcb6327aaa159cd39a7ffb087176875c716 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 16:59:25 +0100 Subject: [PATCH 06/19] =?UTF-8?q?Suppression=20du=20n=C2=B0=20de=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/development.json | 4 ++-- config/production.json | 2 +- config/session.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/development.json b/config/development.json index ec5b564..60c9b73 100644 --- a/config/development.json +++ b/config/development.json @@ -1,4 +1,4 @@ { - "port": 8000, +// "port": 8000, "dbType": "sqlite" -} \ No newline at end of file +} diff --git a/config/production.json b/config/production.json index 9e62d44..9c41c3c 100644 --- a/config/production.json +++ b/config/production.json @@ -1,5 +1,5 @@ { - "port": 8000, +// "port": 8000, "dbType": "couch", "couchVarLib": "/var/lib/couchdb/1.0.1/", "authEngine" : "session", diff --git a/config/session.json b/config/session.json index 725e694..f58b3c6 100644 --- a/config/session.json +++ b/config/session.json @@ -1,5 +1,5 @@ { - "port": 8000, +// "port": 8000, "dbType": "couch", "couchVarLib": "/usr/local/var/lib/couchdb/", "authEngine" : "session", From e233fac61f186cd6a9ae20083bee1bb76deb63bd Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 17:02:09 +0100 Subject: [PATCH 07/19] suppression de commentaires --- config/development.json | 1 - config/production.json | 1 - config/session.json | 1 - 3 files changed, 3 deletions(-) diff --git a/config/development.json b/config/development.json index 60c9b73..94f4a56 100644 --- a/config/development.json +++ b/config/development.json @@ -1,4 +1,3 @@ { -// "port": 8000, "dbType": "sqlite" } diff --git a/config/production.json b/config/production.json index 9c41c3c..591ebf1 100644 --- a/config/production.json +++ b/config/production.json @@ -1,5 +1,4 @@ { -// "port": 8000, "dbType": "couch", "couchVarLib": "/var/lib/couchdb/1.0.1/", "authEngine" : "session", diff --git a/config/session.json b/config/session.json index f58b3c6..0ec45f7 100644 --- a/config/session.json +++ b/config/session.json @@ -1,5 +1,4 @@ { -// "port": 8000, "dbType": "couch", "couchVarLib": "/usr/local/var/lib/couchdb/", "authEngine" : "session", From 1e7a14c18fa15200d90ec61c42a25f06751fd668 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 17:05:01 +0100 Subject: [PATCH 08/19] =?UTF-8?q?Mise=20a=2080=20du=20N=C2=B0=20de=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/development.json | 1 + config/production.json | 1 + config/session.json | 1 + 3 files changed, 3 insertions(+) diff --git a/config/development.json b/config/development.json index 94f4a56..f1d471c 100644 --- a/config/development.json +++ b/config/development.json @@ -1,3 +1,4 @@ { + "port": 80, "dbType": "sqlite" } diff --git a/config/production.json b/config/production.json index 591ebf1..7b53f98 100644 --- a/config/production.json +++ b/config/production.json @@ -1,4 +1,5 @@ { + "port": 80, "dbType": "couch", "couchVarLib": "/var/lib/couchdb/1.0.1/", "authEngine" : "session", diff --git a/config/session.json b/config/session.json index 0ec45f7..d065872 100644 --- a/config/session.json +++ b/config/session.json @@ -1,4 +1,5 @@ { + "port": 80, "dbType": "couch", "couchVarLib": "/usr/local/var/lib/couchdb/", "authEngine" : "session", From 48852ce5f009fd41d80829bf64c9cb68474b99fe Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 17:17:44 +0100 Subject: [PATCH 09/19] remise en place du port d'origine --- config/development.json | 4 ++-- config/production.json | 2 +- config/session.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/development.json b/config/development.json index f1d471c..ec5b564 100644 --- a/config/development.json +++ b/config/development.json @@ -1,4 +1,4 @@ { - "port": 80, + "port": 8000, "dbType": "sqlite" -} +} \ No newline at end of file diff --git a/config/production.json b/config/production.json index 7b53f98..9e62d44 100644 --- a/config/production.json +++ b/config/production.json @@ -1,5 +1,5 @@ { - "port": 80, + "port": 8000, "dbType": "couch", "couchVarLib": "/var/lib/couchdb/1.0.1/", "authEngine" : "session", diff --git a/config/session.json b/config/session.json index d065872..725e694 100644 --- a/config/session.json +++ b/config/session.json @@ -1,5 +1,5 @@ { - "port": 80, + "port": 8000, "dbType": "couch", "couchVarLib": "/usr/local/var/lib/couchdb/", "authEngine" : "session", From 32ca00a8b4dc370623ff53ebd9a86e4d9a8bdeab Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 17:23:07 +0100 Subject: [PATCH 10/19] =?UTF-8?q?modification=20du=20N=C2=B0=20de=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/development.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/development.json b/config/development.json index ec5b564..f718016 100644 --- a/config/development.json +++ b/config/development.json @@ -1,4 +1,4 @@ { - "port": 8000, + "port": 5000, "dbType": "sqlite" -} \ No newline at end of file +} From feabd6028cb5c2c46b76353a17103222b4b7c217 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Sun, 24 Nov 2013 17:37:35 +0100 Subject: [PATCH 11/19] =?UTF-8?q?prise=20en=20compte=20du=20n=C2=B0=20de?= =?UTF-8?q?=20port=20d'heroku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/server.js b/src/api/server.js index 92e07e4..2a01580 100644 --- a/src/api/server.js +++ b/src/api/server.js @@ -3,7 +3,8 @@ var app = require('./app'); var nconf = require('nconf'); -var port = nconf.get('port'); +//var port = nconf.get('port'); +var port = process.env.PORT || nconf.get('port'); var server = http.createServer(app); server.listen(port, function() { console.info('server started on :' + port + '\n'); From c5ff0df2ff44633bf5ea85cb13b0f652502eaf0e Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Wed, 27 Nov 2013 14:46:22 +0100 Subject: [PATCH 12/19] =?UTF-8?q?mise=20en=20coh=C3=A9rence=20entre=20Hero?= =?UTF-8?q?ku=20et=20GitHub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Procfile | 3 ++- package.json | 8 +++++--- src/api/server.js | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) mode change 100644 => 100755 Procfile mode change 100644 => 100755 package.json mode change 100644 => 100755 src/api/server.js diff --git a/.gitignore b/.gitignore index 49e4866..df30701 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ db/*.db node_modules/ build/ chromedriver.log +*~ diff --git a/Procfile b/Procfile old mode 100644 new mode 100755 index e782f04..69ce640 --- a/Procfile +++ b/Procfile @@ -1 +1,2 @@ -web: nodemon -e js,hbs,json src/api/server.js +web: node -e js,hbs,json src/api/server.js + diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 042386c..4011ce2 --- a/package.json +++ b/package.json @@ -17,9 +17,11 @@ "url": "git://github.com/bjnortier/shapesmith.next.git" }, "contributors": [], - "engines": [ - "node" - ], + "engines": { + "node": "0.10.x", + "npm": "1.2.x" + } +, "scripts": { "test": "grunt test", "start": "nodemon -e js,hbs,json src/api/server.js" diff --git a/src/api/server.js b/src/api/server.js old mode 100644 new mode 100755 index 92e07e4..2a01580 --- a/src/api/server.js +++ b/src/api/server.js @@ -3,7 +3,8 @@ var app = require('./app'); var nconf = require('nconf'); -var port = nconf.get('port'); +//var port = nconf.get('port'); +var port = process.env.PORT || nconf.get('port'); var server = http.createServer(app); server.listen(port, function() { console.info('server started on :' + port + '\n'); From fb8ffcc7fae2722b47f22bd024ce4391ce3e3f43 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Wed, 27 Nov 2013 15:03:12 +0100 Subject: [PATCH 13/19] =?UTF-8?q?Mise=20a=20jour=20du=20fichier=20de=20r?= =?UTF-8?q?=C3=A9f=C3=A9rence=20entre=20GitHub=20et=20Heroku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.git | 1 + 1 file changed, 1 insertion(+) create mode 120000 config.git diff --git a/config.git b/config.git new file mode 120000 index 0000000..74a16c5 --- /dev/null +++ b/config.git @@ -0,0 +1 @@ +.git/config \ No newline at end of file From 8d7ec98d00d7b235b0f566f309936eee8b6d280c Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Wed, 27 Nov 2013 15:36:58 +0100 Subject: [PATCH 14/19] correction du Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 8c3fc85..619a5a6 100755 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: node -e js,hbs,json src/api/server.js +web: node src/api/server.js From 12614c493155c8f1f123991624bba8a61e894e2b Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Wed, 27 Nov 2013 16:04:54 +0100 Subject: [PATCH 15/19] Delete config.git suppression du lien --- config.git | 1 - 1 file changed, 1 deletion(-) delete mode 120000 config.git diff --git a/config.git b/config.git deleted file mode 120000 index 74a16c5..0000000 --- a/config.git +++ /dev/null @@ -1 +0,0 @@ -.git/config \ No newline at end of file From 2304fb1c0f8939535535aad535bc865461c406d2 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Wed, 27 Nov 2013 16:44:37 +0100 Subject: [PATCH 16/19] Modification du fichier de config pour y integrer les commande de synchro --- config.git | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) mode change 120000 => 100644 config.git diff --git a/config.git b/config.git deleted file mode 120000 index 74a16c5..0000000 --- a/config.git +++ /dev/null @@ -1 +0,0 @@ -.git/config \ No newline at end of file diff --git a/config.git b/config.git new file mode 100644 index 0000000..7593c24 --- /dev/null +++ b/config.git @@ -0,0 +1,25 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true +[remote "origin"] + fetch = +refs/heads/*:refs/remotes/origin/* + url = git@github.com:magneval/shapesmith.next.git +[branch "master"] + remote = origin + merge = refs/heads/master +[remote "github"] + url = git@github.com:magneval/shapesmith.next.git + fetch = +refs/heads/*:refs/remotes/github/* +[remote "herokuDev"] + url = git@heroku.com:glacial-reef-8810.git + fetch = +refs/heads/*:refs/remotes/herokuDev/* +[remote "herokuProd"] + url = git@heroku.com:shapesmith.git + fetch = +refs/heads/*:refs/remotes/herokuProd/* + +# git push origin master +# git push herokuDev refs/remotes/origin/master:refs/heads/master + From cc451a89ef8c727f0f0f02fe3005f5e61b5ab5a2 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Thu, 28 Nov 2013 09:07:05 +0100 Subject: [PATCH 17/19] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 01b511d..003a055 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ # Shapesmith.next +you can test it live at [http://glacial-reef-8810.herokuapp.com/](http://glacial-reef-8810.herokuapp.com/) + +this fork has integrate modification for Heroku integretion (developpement profile) + Welcome to Shapesmith.next, the next generation implementation of Shapesmith. You can find the original, stable, version at [http://github.com/bjnortier/shapesmith](http://github.com/bjnortier/shapesmith) From 8e6977dd7209f103c98351389143eebcbd0afc32 Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Fri, 29 Nov 2013 10:29:23 +0100 Subject: [PATCH 18/19] Update server.js remove useless comment --- src/api/server.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/api/server.js b/src/api/server.js index 2a01580..6701245 100755 --- a/src/api/server.js +++ b/src/api/server.js @@ -2,8 +2,6 @@ var http = require('http'); var app = require('./app'); var nconf = require('nconf'); - -//var port = nconf.get('port'); var port = process.env.PORT || nconf.get('port'); var server = http.createServer(app); server.listen(port, function() { From 9067b3e278bfc507fc156ff3c84137e36d4974fd Mon Sep 17 00:00:00 2001 From: Charles de MAGNEVAL Date: Thu, 13 Jul 2017 09:01:47 +0200 Subject: [PATCH 19/19] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4011ce2..7c73fa7 100755 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "contributors": [], "engines": { - "node": "0.10.x", + "node": "4.8.x", "npm": "1.2.x" } ,