Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev

dev.sh

@@ -12,11 +12,12 @@ case "$1" in
 	start|"")
         $0 stop
         echo "Starting nginx."
-        "$nginxBin" -c "$nginxConf" -p "$nginxPrefix"
+        mkdir -p "$nginxPrefix/temp"
+        "$nginxBin" -c "$nginxConf" -p "$nginxPrefix" 2>> /dev/null
     ;;
     stop)
         echo "Stoping nginx."
-        "$nginxBin" -c "$nginxConf" -p "$nginxPrefix" -s stop
+        "$nginxBin" -c "$nginxConf" -p "$nginxPrefix" -s stop 2>> /dev/null
     ;;
     *)
         echo "Usage: `basename "$0"` [start|stop]"

services/mailer/application/config/app.json

@@ -0,0 +1,9 @@
+{
+    "name": "MailServer",
+    "version": "1.0.0",
+    "port": 3003,
+    "debug": true,
+    "defaultLanguage": "es",
+    "senderMail": "noreply@localhost",
+    "senderName": ""
+}

services/mailer/application/config/mysql.json

@@ -0,0 +1,7 @@
+{
+    "host": "localhost",
+    "port": 3306,
+    "user": "reports",
+    "password": "",
+    "database": ""
+}

services/mailer/application/config/smtp.json

@@ -0,0 +1,9 @@
+{
+    "host": "localhost",
+    "port": 465,
+    "secure": true,
+    "auth": {
+        "user": "noreply",
+        "pass": ""
+    }
+}

services/mailer/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "MailServer",
+  "name": "mailer",
   "version": "0.0.1",
   "description": "Servidor de envío de correos",
   "main": "server.js",

services/mailer/server.js

@@ -4,16 +4,16 @@
 var express = require('express');
 var app = module.exports = express();
 var bodyParser = require('body-parser');
-var settings = require('./Application/settings.js');
-var mail = require('./Application/mail.js');
-var database = require('./Application/database.js');
+var settings = require('./application/settings.js');
+var mail = require('./application/mail.js');
+var database = require('./application/database.js');
 
 // Middleware
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({extended: true}));
 
 // Cargar rutas
-app.use('/', require('./Application/router.js'));
+app.use('/', require('./application/router.js'));
 
 // Iniciar escucha del servidor
 app.start = function() {