Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

sails/bootstrap.sh

@@ -7,6 +7,8 @@ elif [ -e "/vagrant/src/app.js" ]; then
   cd /vagrant/src && forever start app.js --debug
   cd /vagrant/src && forever start app.js --debug
 elif [ -e "/home/vagrant/sync/src/app.js" ]; then
 elif [ -e "/home/vagrant/sync/src/app.js" ]; then
   cd /home/vagrant/sync/src && forever start app.js --debug
   cd /home/vagrant/sync/src && forever start app.js --debug
+elif [ -e "/home/ubuntu/pictogram/sails/src/app.js" ]; then
+  cd /home/ubuntu/pictogram/sails/src && forever start app.js --debug
 else
 else
   echo "-- app.js not found, cannot run pictogram server"
   echo "-- app.js not found, cannot run pictogram server"
   exit
   exit

sails/roles/database/files/init.sql

@@ -2,10 +2,9 @@ SET foreign_key_checks=0;
 DROP USER IF EXISTS 'pictodbu';
 DROP USER IF EXISTS 'pictodbu';
 DELETE FROM mysql.user WHERE user='pictodbu';
 DELETE FROM mysql.user WHERE user='pictodbu';
 FLUSH PRIVILEGES;
 FLUSH PRIVILEGES;
-CREATE USER 'pictodbu'@'localhost' identified by 'p1KT0!15.';
-GRANT USAGE ON *.* TO 'pictodbu'@'localhost';
+CREATE USER 'pictodbu'@'%' identified by 'r"YjtnB+a4$.M*nJ';
 DROP DATABASE IF EXISTS pictodb;
 DROP DATABASE IF EXISTS pictodb;
 CREATE DATABASE pictodb;
 CREATE DATABASE pictodb;
 SET foreign_key_checks=1;
 SET foreign_key_checks=1;
-GRANT all privileges ON pictodb.* to 'pictodbu'@'localhost' identified by 'p1KT0!15.';
+GRANT all privileges ON pictodb.* to 'pictodbu'@'localhost' identified by 'r"YjtnB+a4$.M*nJ';
 FLUSH PRIVILEGES;
 FLUSH PRIVILEGES;

sails/roles/database/files/test-centrodestrezas.sql

@@ -73,7 +73,7 @@ INSERT IGNORE INTO `student` (
   'es-es',
   'es-es',
   (SELECT id from office WHERE email='centrodestrezas@gmail.com'),
   (SELECT id from office WHERE email='centrodestrezas@gmail.com'),
   '{"stu-att":[{"categories":"on","input feedback":["vibration","tts"],"input selection":"click","pictogram size":"medium"}]}'
   '{"stu-att":[{"categories":"on","input feedback":["vibration","tts"],"input selection":"click","pictogram size":"medium"}]}'
-)
+);
 
 
 INSERT IGNORE INTO `stu_picto` (
 INSERT IGNORE INTO `stu_picto` (
   `id_stu`,
   `id_stu`,

sails/roles/database/vars/main.yml

@@ -2,5 +2,5 @@
 database_files_relative_path: 'roles/database/files'
 database_files_relative_path: 'roles/database/files'
 database_name: pictodb
 database_name: pictodb
 database_user: pictodbu
 database_user: pictodbu
-database_user_passwd: p1KT0!15.
+database_user_passwd: r"YjtnB+a4$.M*nJ
 database_tests: [caja] #[caja, autismojaen] # can be empty
 database_tests: [caja] #[caja, autismojaen] # can be empty

sails/roles/server/files/local.js

@@ -36,11 +36,14 @@ module.exports = {
    * responses over https:// and/or use websockets over the wss:// protocol
    * responses over https:// and/or use websockets over the wss:// protocol
    * (recommended for HTTP, strongly encouraged for WebSockets)
    * (recommended for HTTP, strongly encouraged for WebSockets)
    */
    */
-  ssl: {
-    // ca: fs.readFileSync(path.join(__dirname, 'ssl', 'development-bundle.crt')),
-    key: fs.readFileSync(path.join(__dirname, 'ssl', 'development.key')),
-    cert: fs.readFileSync(path.join(__dirname, 'ssl', 'development.crt')),
+
+/*  UNCOMMENT FOR HTTPS */
+/*    ssl: {
+    ca: fs.readFileSync(path.join(__dirname, 'ssl', '/etc/letsencrypt/live/xxx.yottacode.com/chain.pem')),
+    key: fs.readFileSync(path.join(__dirname, 'ssl', '/etc/letsencrypt/live/xxx.yottacode.com/privkey.pem')),
+    cert: fs.readFileSync(path.join(__dirname, 'ssl', '/etc/letsencrypt/live/xxx.yottacode.com/fullchain.pem')),
   },
   },
+*/
 
 
   /**
   /**
    * The `port` setting determines which TCP port your app will be
    * The `port` setting determines which TCP port your app will be

sails/src/config/connections.js

@@ -26,7 +26,7 @@ module.exports.connections = {
     host: 'localhost',
     host: 'localhost',
     port: 3306,
     port: 3306,
     user: 'pictodbu',
     user: 'pictodbu',
-    password: 'p1KT0!15.',
+    password: 'r"YjtnB+a4$.M*nJ',
     database: 'pictodb',
     database: 'pictodb',
     charset   : 'utf8',
     charset   : 'utf8',
     collation : 'utf8_unicode_ci'
     collation : 'utf8_unicode_ci'

sails/src/config/ssl/letsencrypt.md

@@ -56,7 +56,8 @@ Con el contenido para ssl:
 ```
 ```
    ssl: {
    ssl: {
        key: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/privkey.pem'),
        key: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/privkey.pem'),
-       cert: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/cert.pem')   
+       cert: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/fullchain.pem'),
+       ca: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/chain.pem')   
    },    
    },    
 ```
 ```