From bd51197ca4c22e85966d380be31a0dcd2e3fa1eb Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 30 Sep 2013 15:05:43 -0700 Subject: [PATCH] Replace queries.json with queries.yaml for elastic-recheck Change-Id: Id5d9b9c2729abbf8572c9c785c5026d0138b72c9 --- manifests/init.pp | 8 ++++---- templates/elastic-recheck.conf.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9be93aa..a00b9f2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -105,10 +105,10 @@ class elastic_recheck ( require => File['/etc/elastic-recheck'], } - # TODO(clarkb) put queries.json somewhere else. - file { '/etc/elastic-recheck/queries.json': + # TODO(clarkb) put queries.yaml somewhere else. + file { '/etc/elastic-recheck/queries.yaml': ensure => link, - target => '/opt/elastic-recheck/queries.json', + target => '/opt/elastic-recheck/queries.yaml', require => [ Vcsrepo['/opt/elastic-recheck'], File['/etc/elastic-recheck'], @@ -155,7 +155,7 @@ class elastic_recheck ( require => [ File['/etc/init.d/elastic-recheck'], File['/etc/elastic-recheck/elastic-recheck.conf'], - File['/etc/elastic-recheck/queries.json'], + File['/etc/elastic-recheck/queries.yaml'], Exec['install_elastic-recheck'], ], } diff --git a/templates/elastic-recheck.conf.erb b/templates/elastic-recheck.conf.erb index b363968..cea1cc3 100644 --- a/templates/elastic-recheck.conf.erb +++ b/templates/elastic-recheck.conf.erb @@ -10,5 +10,5 @@ log_config=/etc/elastic-recheck/logging.config [gerrit] user=<%= gerrit_user %> host=<%= gerrit_host %> -query_file=/etc/elastic-recheck/queries.json +query_file=/etc/elastic-recheck/queries.yaml key=<%= gerrit_ssh_private_key %>