From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 16 Sep 2019 08:37:25 +0000 (+0200)
Subject: re-arrange hieradata/common slightly
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=6afa8d9fe724455a06482df6a33f020fef38ae7a;p=mirror%2Fdsa-puppet.git

re-arrange hieradata/common slightly
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 71b1519a3..57ce7a575 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -7,8 +7,13 @@ lookup_options:
   apt::sources::debian::location:
     merge: unique
 
+# class parameters
 resolv::nameservers: []
 resolv::searchpaths: ['debian.org']
+staticsync::user: 'staticsync'
+staticsync::basedir: '/srv/static.debian.org'
+
+# other variables
 allow_dns_query: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -27,8 +32,6 @@ paths:
   auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
 apt::sources::debian::location: 'https://deb.debian.org/debian/'
 
-staticsync::user: 'staticsync'
-staticsync::basedir: '/srv/static.debian.org'
 
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09