From 88b840a2e6aee49fe316de64a7610f61c48976a3 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Wed, 9 Sep 2020 14:01:21 +0200
Subject: [PATCH] Cosmetic, reorder stanzas

---
 modules/rhizo_base/manifests/init.pp | 48 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 8488632..e6a6228 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -381,6 +381,26 @@ schedule { 'never':
                     Exec['rrd-n-create'], ],
     }
 
+  vcsrepo { '/var/meas':
+      schedule => 'onceday',
+      ensure   => latest,
+      provider => git,
+      # source   => 'https://github.com/whyteks/meas_web.git',
+      source   => 'https://gitlab.tic-ac.org/keith/meas_web.git',
+      revision => 'master',
+      require  => [ Package['git'] ],
+      notify   => [ Exec['restart-meas'] ],
+    }
+
+  vcsrepo { '/var/rates':
+    schedule  => 'onceday',
+    ensure    => latest,
+    revision  => 'master',
+    provider  => git,
+    source    => 'git@dev.rhizomatica.org:rhizomatica/rates.git',
+    require   => File['/root/.ssh/bsc_dev'],
+  }
+
   file { '/var/rhizomatica/rccn/config_values.py':
       ensure  => present,
       content => template('rhizo_base/config_values.py.erb'),
@@ -392,15 +412,10 @@ schedule { 'never':
                     Exec['restart-esme'], ],
     }
 
-  vcsrepo { '/var/meas':
-      schedule => 'onceday',
-      ensure   => latest,
-      provider => git,
-      # source   => 'https://github.com/whyteks/meas_web.git',
-      source   => 'https://gitlab.tic-ac.org/keith/meas_web.git',
-      revision => 'master',
-      require  => [ Package['git'] ],
-      notify   => [ Exec['restart-meas'] ],
+  file { '/var/rhizomatica/bts_defs.json':
+      ensure  => present,
+      content => template('rhizo_base/bts_defs.json.erb'),
+      require => File['/var/rhizomatica'],
     }
 
   file { '/var/meas/www/meas-web/bts_defs.js':
@@ -416,21 +431,6 @@ schedule { 'never':
       mode    => '0755',
     }
 
-  vcsrepo { '/var/rates':
-    schedule  => 'onceday',
-    ensure    => latest,
-    revision  => 'master',
-    provider  => git,
-    source    => 'git@dev.rhizomatica.org:rhizomatica/rates.git',
-    require   => File['/root/.ssh/bsc_dev'],
-  }
-
-  file { '/var/rhizomatica/bts_defs.json':
-      ensure  => present,
-      content => template('rhizo_base/bts_defs.json.erb'),
-      require => File['/var/rhizomatica'],
-    }
-
   file { '/var/rhizomatica/bin/check_account_balance.sh':
       ensure  => present,
       content => template('rhizo_base/check_account_balance.sh.erb'),