Only one config for client and server.
This commit is contained in:
parent
46717e14ae
commit
a2723c6b12
|
@ -82,6 +82,10 @@ module.exports = function (grunt) {
|
|||
context: '/api/',
|
||||
host: '127.0.0.1',
|
||||
port: 8080
|
||||
}, {
|
||||
context: '/config.js',
|
||||
host: '127.0.0.1',
|
||||
port: 8080
|
||||
}],
|
||||
livereload: {
|
||||
options: {
|
||||
|
|
|
@ -44,7 +44,6 @@
|
|||
<!-- build:js scripts/scripts.js -->
|
||||
<script src="scripts/app.js"></script>
|
||||
<script src="scripts/libs.js"></script>
|
||||
<script src="scripts/config.js"></script>
|
||||
|
||||
<script src="scripts/controllers/main.js"></script>
|
||||
<script src="scripts/controllers/newNodeCtrl.js"></script>
|
||||
|
@ -60,5 +59,7 @@
|
|||
|
||||
<script src="scripts/validation/constraints.js"></script>
|
||||
<!-- endbuild -->
|
||||
|
||||
<script src="config.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('ffffng')
|
||||
.factory('config', function () {
|
||||
return {
|
||||
community: {
|
||||
name: 'Freifunk Hamburg',
|
||||
domain: 'hamburg.freifunk.net',
|
||||
contactEmail: 'kontakt@hamburg.freifunk.net'
|
||||
},
|
||||
map: {
|
||||
graphUrl: 'http://graph.hamburg.freifunk.net/graph.html',
|
||||
mapUrl: 'http://graph.hamburg.freifunk.net/geomap.html'
|
||||
},
|
||||
coordsSelector: {
|
||||
lat: 53.565278,
|
||||
lng: 10.001389,
|
||||
defaultZoom: 10
|
||||
}
|
||||
};
|
||||
});
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('ffffng').factory('app', function (fs) {
|
||||
angular.module('ffffng').factory('app', function (fs, config, _) {
|
||||
var express = require('express');
|
||||
var bodyParser = require('body-parser');
|
||||
var compress = require('compression');
|
||||
|
@ -10,8 +10,34 @@ angular.module('ffffng').factory('app', function (fs) {
|
|||
app.use(bodyParser());
|
||||
|
||||
var clientDir = __dirname + '/../client';
|
||||
var templateDir = __dirname + '/templates';
|
||||
|
||||
var jsTemplateFiles = [
|
||||
'/config.js'
|
||||
];
|
||||
|
||||
app.use(compress());
|
||||
|
||||
function serveTemplate(mimeType, req, res, next) {
|
||||
return fs.readFile(templateDir + '/' + req.path, 'utf8', function (err, body) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
}
|
||||
|
||||
res.writeHead(200, {'Content-Type': mimeType});
|
||||
res.end(_.template(body, { config: config.client }));
|
||||
|
||||
return null; // to suppress warning
|
||||
});
|
||||
}
|
||||
|
||||
app.use( function (req, res, next) {
|
||||
if (jsTemplateFiles.indexOf(req.path) >= 0) {
|
||||
return serveTemplate('application/javascript', req, res, next);
|
||||
}
|
||||
return next();
|
||||
});
|
||||
|
||||
app.use('/', express.static(clientDir + '/'));
|
||||
|
||||
return app;
|
||||
|
|
|
@ -2,7 +2,25 @@
|
|||
|
||||
angular.module('ffffng').factory('config', function () {
|
||||
return {
|
||||
port: 8080,
|
||||
peersPath: '/tmp/peers'
|
||||
server: {
|
||||
port: 8080,
|
||||
peersPath: '/tmp/peers'
|
||||
},
|
||||
client: {
|
||||
community: {
|
||||
name: 'Freifunk Hamburg',
|
||||
domain: 'hamburg.freifunk.net',
|
||||
contactEmail: 'kontakt@hamburg.freifunk.net'
|
||||
},
|
||||
map: {
|
||||
graphUrl: 'http://graph.hamburg.freifunk.net/graph.html',
|
||||
mapUrl: 'http://graph.hamburg.freifunk.net/geomap.html'
|
||||
},
|
||||
coordsSelector: {
|
||||
lat: 53.565278,
|
||||
lng: 10.001389,
|
||||
defaultZoom: 10
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
@ -25,6 +25,6 @@ require('./validation/validator');
|
|||
angular.injector(['ffffng']).invoke(function (config, app, Router) {
|
||||
Router.init();
|
||||
|
||||
app.listen(config.port, '::');
|
||||
app.listen(config.server.port, '::');
|
||||
module.exports = app;
|
||||
});
|
||||
|
|
|
@ -16,7 +16,7 @@ angular.module('ffffng')
|
|||
}
|
||||
|
||||
function findNodeFiles(pattern) {
|
||||
return glob.sync(config.peersPath + '/' + pattern.toLowerCase());
|
||||
return glob.sync(config.server.peersPath + '/' + pattern.toLowerCase());
|
||||
}
|
||||
|
||||
function isDuplicate(pattern, token) {
|
||||
|
@ -52,7 +52,7 @@ angular.module('ffffng')
|
|||
|
||||
function writeNodeFile(isUpdate, token, node, callback) {
|
||||
var filename =
|
||||
config.peersPath + '/' + (node.hostname + '@' + node.mac + '@' + node.key + '@' + token).toLowerCase();
|
||||
config.server.peersPath + '/' + (node.hostname + '@' + node.mac + '@' + node.key + '@' + token).toLowerCase();
|
||||
|
||||
var data = '';
|
||||
_.each(linePrefixes, function (prefix, key) {
|
||||
|
|
6
server/templates/config.js
Normal file
6
server/templates/config.js
Normal file
|
@ -0,0 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('ffffng')
|
||||
.factory('config', function () {
|
||||
return <%= JSON.stringify(config) %>;
|
||||
});
|
Loading…
Reference in a new issue