From 4d312a59574fc19da775aea5c391a859a67313a8 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 Apr 2014 00:18:20 +0200 Subject: [PATCH] Add configuration option to disable top level menu for javamelody plugin Change-Id: I696db6a16b1ba57000951186367501c376f321de --- modules/gerrit/manifests/init.pp | 1 + modules/gerrit/templates/gerrit.config.erb | 2 ++ modules/openstack_project/manifests/gerrit.pp | 1 + 3 files changed, 4 insertions(+) diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index 007e3f11f0..900c4525d3 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -151,6 +151,7 @@ class gerrit( $testmode = false, $secondary_index = false, $secondary_index_type = 'LUCENE', + $enable_javamelody_top_menu = false, ) { include apache include jeepyb diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index b35d077e0a..dd92c9b9a0 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -101,6 +101,8 @@ [melody] monitoring = <%= enable_melody %> session = <%= melody_session %> +[plugin "javamelody"] + allowTopMenu = <%= enable_javamelody_top_menu %> <% if gitweb or cgit -%> [gitweb] <% if gitweb -%> diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 2e8d5a8695..9d791cc4a6 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -108,6 +108,7 @@ class openstack_project::gerrit ( enable_melody => true, melody_session => true, robots_txt_source => 'puppet:///modules/openstack_project/gerrit/robots.txt', + enable_javamelody_top_menu => false, # passthrough ssl_cert_file => $ssl_cert_file, ssl_key_file => $ssl_key_file,