Skip to content

Commit

Permalink
PASSBOLT-3363 The webinstaller should not use the exec php primitive …
Browse files Browse the repository at this point in the history
…to create/import the gpg server key
  • Loading branch information
cedricalfonsi committed Feb 6, 2019
1 parent f3c38f5 commit be84671
Show file tree
Hide file tree
Showing 21 changed files with 1,826 additions and 533 deletions.
11 changes: 11 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ module.exports = function(grunt) {
/**
* Register project specific grunt tasks
*/
grunt.registerTask('default', ['dependencies-update', 'styleguide-update', 'appjs-update']);
grunt.registerTask('appjs-update', 'copy:appjs');
grunt.registerTask('appjs-watch', ['watch:node-modules-appjs']);
grunt.registerTask('appjs-watch-browser-sync', ['browserSync:appjs', 'watch:node-modules-appjs']);
grunt.registerTask('styleguide-update', 'copy:styleguide');
grunt.registerTask('dependencies-update', 'copy:dependencies');

/**
* Tasks definition
Expand All @@ -80,6 +82,15 @@ module.exports = function(grunt) {
},

copy: {
dependencies: {
files: [{
// Openpgp
cwd: paths.node_modules + 'openpgp/dist',
src: ['openpgp.min.js'],
dest: paths.js + 'vendors',
expand: true
}]
},
appjs: {
files: [{
cwd: paths.node_modules_appjs + 'dist',
Expand Down
216 changes: 216 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"grunt": "^1.0.3",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-watch": "^1.1.0",
"openpgp": "^4.4.6",
"passbolt-appjs": "^2.6.0",
"passbolt-styleguide": "^2.4.6"
}
Expand Down
Loading

0 comments on commit be84671

Please sign in to comment.