# 814 Separated service modules from services

.eslintrc.yml

@@ -25,6 +25,8 @@ rules:
     comma-dangle: 0
     bracketSpacing: 0
     space-infix-ops: 1
+    no-invalid-this: 0
+    space-before-function-paren: [error, never]
     prefer-const: 0
     curly: [error, multi-or-nest]
     indent: [error, 4]

services/loopback/server/server.js

@@ -108,7 +108,7 @@ let config = require('./config.json');
 for (let key in config)
     app.set(key, config[key]);
 
-let servicesDir = `${__dirname}/../..`;
+let servicesDir = `${__dirname}/../../modules`;
 
 let modelConfigFiles = [
     `${__dirname}/model-config.json`
@@ -127,13 +127,13 @@ let bootDirs = [
     `${__dirname}/boot`
 ];
 
-let services = require(`${servicesDir}/services.yml`);
+let services = require(`../../services.yml`);
 for (let service of services) {
     let baseDir = `${servicesDir}/${service}`;
-    modelConfigFiles.push(`${baseDir}/server/model-config.json`);
-    modelSources.push(`${baseDir}/common/models`);
-    mixinDirs.push(`${baseDir}/common/mixins`);
-    bootDirs.push(`${baseDir}/server/boot`);
+    modelConfigFiles.push(`${baseDir}/model-config.json`);
+    modelSources.push(`${baseDir}/models`);
+    mixinDirs.push(`${baseDir}/mixins`);
+    bootDirs.push(`${baseDir}/boot`);
 }
 
 let models = {};