diff --git a/src/views/index.html b/src/views/index.html
index 0cb3e2cd2d7..d1c5f896fb9 100644
--- a/src/views/index.html
+++ b/src/views/index.html
@@ -16,8 +16,8 @@
-
-
+
+
@@ -25,7 +25,7 @@
-
+
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 47f4605373e..e605a54a8a3 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -23,6 +23,34 @@ module.exports = function(grunt) {
//'uglify:dest'
]);
+ grunt.registerTask('build-post-process', function() {
+ var mode = grunt.config.get('mode');
+ if (mode === 'backend') {
+ grunt.config('copy.dist_to_tmp', {
+ expand: true,
+ cwd: '<%= destDir %>',
+ src: '**/*',
+ dest: '<%= tempDir %>/public/',
+ });
+ grunt.config('copy.backend_bin', {
+ cwd: '../bin',
+ expand: true,
+ src: ['grafana'],
+ options: { mode: true},
+ dest: '<%= tempDir %>'
+ });
+ grunt.config('copy.backend_conf', {
+ cwd: '../',
+ expand: true,
+ src: ['conf/*', '!conf/grafana.dev.ini'],
+ dest: '<%= tempDir %>'
+ });
+ grunt.task.run('copy:dist_to_tmp');
+ grunt.task.run('copy:backend_bin');
+ grunt.task.run('copy:backend_conf');
+ }
+ });
+
grunt.registerTask('build:grafanaVersion', function() {
grunt.config('string-replace.config', {
files: {
diff --git a/tasks/distribute_task.js b/tasks/distribute_task.js
index 7cff5efb897..56b76a4c749 100644
--- a/tasks/distribute_task.js
+++ b/tasks/distribute_task.js
@@ -1,31 +1,11 @@
module.exports = function(grunt) {
-
- // build, then zip and upload to s3
- grunt.registerTask('distribute', [
- 'distribute:load_s3_config',
- 'build',
- 'compress:zip',
- 'compress:tgz',
- 's3:dist',
- 'clean:temp'
- ]);
+ "use strict";
// build, then zip and upload to s3
grunt.registerTask('release', [
- // 'distribute:load_s3_config',
'build',
'compress:zip_release',
'compress:tgz_release',
- //'s3:release',
- //'clean:temp'
]);
- // collect the key and secret from the .aws-config.json file, finish configuring the s3 task
- grunt.registerTask('distribute:load_s3_config', function () {
- var config = grunt.file.readJSON('.aws-config.json');
- grunt.config('s3.options', {
- key: config.key,
- secret: config.secret
- });
- });
-}
\ No newline at end of file
+};