git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
path: root/environment.conf
diff options
context:
space:
mode:
authormail_redacted_for_web 2015-11-25 16:51:43 +0000
committermail_redacted_for_web 2015-11-25 16:51:43 +0000
commit2859cffba989f4751d60ab0127e7ad5e7b65278a (patch)
treed74953d5f0595d1e1082dfece1f22e97111f7a51 /environment.conf
parentc2bd0d3ca1fd4e9f2fce24196201835272fd1e21 (diff)
parent10732cf3700bce033091fc3d0e1e5d9bb643932d (diff)
downloadcontrol-repo-template-2859cffba989f4751d60ab0127e7ad5e7b65278a.tar.bz2
Merged from upstream
Diffstat (limited to 'environment.conf')
-rw-r--r--environment.conf6
1 files changed, 0 insertions, 6 deletions
diff --git a/environment.conf b/environment.conf
index 6d60708..5ba929b 100644
--- a/environment.conf
+++ b/environment.conf
@@ -1,8 +1,2 @@
modulepath = modules:site:$basemodulepath
config_version = 'scripts/config_version.sh $environmentpath $environment'
-
-# Environment timeout should be set to unlimited. When set to zero it is less performant.
-# When code is deployed the admin API of puppetserver should be used to force a refresh of code from disk.
-# https://docs.puppetlabs.com/puppetserver/1.0/release_notes.html#new-feature-admin-api-for-refreshing-environments
-# https://docs.puppetlabs.com/puppet/3.7/reference/environments_configuring.html#environmenttimeout
-environment_timeout = 0