From b7528bbc2680a4c91c526ab42c8ead1bc4356040 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Fri, 11 Sep 2020 19:02:33 +0200 Subject: [PATCH] bts_defs.json; require vcsrepo, not file The creation of this file should depend on the Vcsrepo, not on the File directive, otherwise on an initial install if the file is created first, then Vcsrepo will refuse to clone the repo: Error: Path /var/rhizomatica exists and is not the desired repository. --- modules/rhizo_base/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index 725b12f..b7a8c41 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -415,7 +415,7 @@ schedule { 'never': file { '/var/rhizomatica/bts_defs.json': ensure => present, content => template('rhizo_base/bts_defs.json.erb'), - require => File['/var/rhizomatica'], + require => Vcsrepo['/var/rhizomatica'], } file { '/var/meas/www/meas-web/bts_defs.js':