diff --git a/Gruntfile.js b/Gruntfile.js index 57fb1b4d..a92181a1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-jsbeautifier'); grunt.registerTask('default', ['jshint', 'express:dev', 'mochaTest']); - grunt.registerTask('dev', ['jshint', 'jsbeautifier']); + grunt.registerTask('dev', ['jshint', 'jsbeautifier', 'express:dev', 'watch']); // Print a timestamp (useful for when watching) grunt.registerTask('timestamp', function () { diff --git a/deploy/ansible/roles/dre/tasks/main.yml b/deploy/ansible/roles/dre/tasks/main.yml index 08c2892f..11108e2a 100644 --- a/deploy/ansible/roles/dre/tasks/main.yml +++ b/deploy/ansible/roles/dre/tasks/main.yml @@ -7,23 +7,23 @@ - name: Make node user user: name=node group=node system=yes state=present -- name: Make DRE folder - command: mkdir -p "/var/www/dre" +#- name: Make DRE folder +# command: mkdir -p "/var/www/dre" -- name: Make source folder - command: mkdir -p "/var/www/dre/source" +#- name: Make source folder +# command: mkdir -p "/var/www/dre/source" -- name: Make shared folder - command: mkdir -p "/var/www/dre/shared" +#- name: Make shared folder +# command: mkdir -p "/var/www/dre/shared" -- name: Make current folder - command: mkdir -p "/var/www/dre/current" +#- name: Make current folder +# command: mkdir -p "/var/www/dre/current" -- name: Clone DRE repository - git: repo="https://github.com/amida-tech/DRE.git" dest="/var/www/dre/source" #version="v1.3.1" +#- name: Clone DRE repository +# git: repo="https://github.com/amida-tech/DRE.git" dest="/var/www/dre/source" #version="v1.3.1" -- name: Copy DRE source to current - command: cp -r /var/www/dre/source/. /var/www/dre/current +#- name: Copy DRE source to current +# command: cp -r /var/www/dre/source/. /var/www/dre/current - name: Install grunt CLI tools sudo: yes @@ -45,7 +45,7 @@ # command: npm install chdir=/var/www/dre/current/client - name: Install DRE client bower dependencies - command: bower install --allow-root chdir=/var/www/dre/current/client + command: bower install --allow-root chdir=/vagrant/dre/client #- name: Install ruby @@ -70,14 +70,14 @@ - name: Install DRE server dependencies - command: npm install --production chdir=/var/www/dre/current + command: npm install chdir=/vagrant/dre -- name: Install PM2 - command: npm install -g pm2 --unsafe-perm +#- name: Install PM2 +# command: npm install -g pm2 --unsafe-perm -- name: Launch DRE through PM2 - command: pm2 start /var/www/dre/current/server.js +#- name: Launch DRE through PM2 +# command: pm2 start /var/www/dre/current/server.js -- name: Configure PM2 for Auto-reload - command: pm2 startup centos -u node && pm2 save +#- name: Configure PM2 for Auto-reload +# command: pm2 startup centos -u node && pm2 save diff --git a/deploy/ansible/roles/mongodb/files/10gen.repo.j2 b/deploy/ansible/roles/mongodb/files/10gen.repo.j2 deleted file mode 100644 index d0042cb3..00000000 --- a/deploy/ansible/roles/mongodb/files/10gen.repo.j2 +++ /dev/null @@ -1,5 +0,0 @@ -[10gen] -name=10gen Repository -baseurl=http://downloads-distro.mongodb.org/repo/redhat/os/x86_64 -gpgcheck=0 -enabled=1 diff --git a/deploy/ansible/roles/mongodb/files/mongodb-org-3.repo.j2 b/deploy/ansible/roles/mongodb/files/mongodb-org-3.repo.j2 new file mode 100644 index 00000000..f47f8069 --- /dev/null +++ b/deploy/ansible/roles/mongodb/files/mongodb-org-3.repo.j2 @@ -0,0 +1,5 @@ +[mongodb-org-3] +name=MongoDB Repository +baseurl=http://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.0/x86_64/ +gpgcheck=0 +enabled=1 \ No newline at end of file diff --git a/deploy/ansible/roles/mongodb/tasks/main.yml b/deploy/ansible/roles/mongodb/tasks/main.yml index 9e15627e..e63380b0 100644 --- a/deploy/ansible/roles/mongodb/tasks/main.yml +++ b/deploy/ansible/roles/mongodb/tasks/main.yml @@ -8,12 +8,12 @@ user: name=mongod group=mongod comment="MongoD" append=yes sudo: yes -- name: Install 10gen yum repo - copy: src=10gen.repo.j2 dest=/etc/yum.repos.d/10gen.repo +- name: Install mongodb-org-3 yum repo + copy: src=mongodb-org-3.repo.j2 dest=/etc/yum.repos.d/mongodb-org-3.repo sudo: yes - name: Install mongodb - yum: name={{item}} enablerepo="10gen" state="installed" + yum: name={{item}} enablerepo="mongodb-org-3" state="installed" sudo: yes with_items: - mongodb-org diff --git a/deploy/vagrant/Vagrantfile b/deploy/vagrant/Vagrantfile index f8e4dc98..f09a6ce7 100644 --- a/deploy/vagrant/Vagrantfile +++ b/deploy/vagrant/Vagrantfile @@ -16,6 +16,7 @@ Vagrant.configure("2") do |config| # Shared folders. # You can only use NFS (second option below) once nfs-utils is installed. + config.vm.synced_folder "/Users/matthewmartz/Development/Amida/DRE", "/vagrant/dre" # config.vm.synced_folder "/path/to/local/folder", "/path/to/remote" # config.vm.synced_folder "/path/to/local/folder", "/path/to/remote", # :nfs => !RUBY_PLATFORM.downcase.include?("w32"), diff --git a/package.json b/package.json index daf56fac..449fe8e6 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "method-override": "2.2.0", "mllp-node": "~1.0.0", "mocha": "1.18.x", - "mongodb": "1.4.x", - "mongoose": "3.8.8", + "mongodb": "^2.0.14", + "mongoose": "^4.0", "morgan": "1.3.2", "passport": "0.2.x", "passport-local": "1.0.x",