From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 19 Mar 2017 09:35:29 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b529b139a60ea8355089511737c8264185d8d074;hp=4939162b3524926ead9e4a832c314b78d379b770;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: (32 commits)
  Do not use sslname empty string for no ssl
  Make scores of webserver related templates compile
  Fix historical mirror apache template
  make order a string
  fix torrc-header tempate
  fix rsync site module
  if we do not have specific binds, we use the empty string to signal that
  Fix stunnel template
  Attempt to fix version comparisons
  Fix munin::conf for new puppet
  Fix schroot-buildd/fstab.erb template
  Remove wheezy support in schroot files
  Remove wheezy support in buildd files
  Make concat::fragment order parameter be a string
  buildd: fix lsbmajdistrelease calls
  fix template
  fix two templates
  fix two templates
  rename nfs-server to nfs_server
  remove rng-tools without hwrandom
  ...
---

diff --git a/environment.conf b/environment.conf
index 5cee66d79..b82f946ba 100644
--- a/environment.conf
+++ b/environment.conf
@@ -1,2 +1,3 @@
 #modulepath = modules:3rdparty/modules:$basemodulepath
 modulepath=/srv/puppet.debian.org/stages/production/modules:/srv/puppet.debian.org/stages/production/3rdparty/modules
+config_version = /srv/puppet.debian.org/stages/production/.config-version