From bb00ca179666deb2b473cf3ec90eb7c29567bfc1 Mon Sep 17 00:00:00 2001
From: GammaNu - Millicent Billette <git@1000i100.fr>
Date: Fri, 18 Nov 2016 17:29:26 +0100
Subject: [PATCH 1/2] =?UTF-8?q?ajout=20d'un=20cesium=20publique=20sur=20so?=
=?UTF-8?q?nt=20port=20par=20d=C3=A9faut=20&=20pr=C3=A9paration=20au=20d?=
=?UTF-8?q?=C3=A9coupage=20de=20duniter-ui=20en=20un=20submodule=20d'insta?=
=?UTF-8?q?ll=20de=20web-ui=20pour=20duniter=20et=20un=20module=20ind?=
=?UTF-8?q?=C3=A9pendant=20de=20webadmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 ++-
misc/duniterConfigToCesium.js | 17 +++++++++++++++++
package.json | 6 +++++-
3 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 misc/duniterConfigToCesium.js
diff --git a/.gitignore b/.gitignore
index 8b081c4..deaf5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ node_modules/
bower_components/
public/
.idea/
-cesium/
\ No newline at end of file
+cesium/
+npm-debug.log
\ No newline at end of file
diff --git a/misc/duniterConfigToCesium.js b/misc/duniterConfigToCesium.js
new file mode 100644
index 0000000..f514bf2
--- /dev/null
+++ b/misc/duniterConfigToCesium.js
@@ -0,0 +1,17 @@
+var fs = require('fs');
+function getUserHome() {
+ return process.env.HOME || process.env.USERPROFILE;
+}
+var duniterConf = JSON.parse(fs.readFileSync(getUserHome()+'/.config/duniter/duniter_default/conf.json', 'utf8'));
+var host = duniterConf.remotehost;
+if(!host) host = duniterConf.remoteipv4;
+if(!host) host = duniterConf.remoteipv6;
+var cesiumConf = {
+ "default": {
+ "node":{
+ "host":host,
+ "port":duniterConf.remoteport
+ }
+ }
+};
+fs.writeFileSync('cesium/app/config.json',JSON.stringify(cesiumConf));
diff --git a/package.json b/package.json
index 3717240..a6e13dc 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,11 @@
"underscore": "1.8.3"
},
"scripts": {
- "postinstall": "node \"node_modules/bower/bin/bower\" install --allow-root && node \"node_modules/brunch/bin/brunch\" build && node cesium.js && mv cesium public/ && cp misc/cesium.js public/cesium/config.js",
+ "postinstall": "npm run webadminInstall && npm run localCesiumInstall && npm run publicCesiumInstall",
+ "webadminInstall": "node \"node_modules/bower/bin/bower\" install --allow-root && node \"node_modules/brunch/bin/brunch\" build",
+ "localCesiumInstall": "node cesium.js && mv cesium public/ && cp misc/cesium.js public/cesium/config.js",
+ "publicCesiumInstall": "git clone https://github.com/duniter/cesium.git && node misc/duniterConfigToCesium.js && cd cesium && npm install",
+ "start":"cd cesium && npm start",
"test": "mocha --growl tests/"
},
"repository": {
--
GitLab
From c460ea7a60d43be65e781620d26ebfed858b98b1 Mon Sep 17 00:00:00 2001
From: GammaNu - Millicent Billette <git@1000i100.fr>
Date: Fri, 18 Nov 2016 17:34:51 +0100
Subject: [PATCH 2/2] application de la config pour le cesium public
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a6e13dc..517b0af 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"postinstall": "npm run webadminInstall && npm run localCesiumInstall && npm run publicCesiumInstall",
"webadminInstall": "node \"node_modules/bower/bin/bower\" install --allow-root && node \"node_modules/brunch/bin/brunch\" build",
"localCesiumInstall": "node cesium.js && mv cesium public/ && cp misc/cesium.js public/cesium/config.js",
- "publicCesiumInstall": "git clone https://github.com/duniter/cesium.git && node misc/duniterConfigToCesium.js && cd cesium && npm install",
+ "publicCesiumInstall": "git clone https://github.com/duniter/cesium.git && node misc/duniterConfigToCesium.js && cd cesium && npm install && ./node_modules/.bin/gulp config --env default",
"start":"cd cesium && npm start",
"test": "mocha --growl tests/"
},
--
GitLab