diff --git a/Puppetfile b/Puppetfile index b282b85..afb4382 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,10 +1,18 @@ forge "http://forge.puppetlabs.com" +# This is a test comment # Modules from the Puppet Forge # Versions should be updated to be the latest at the time you start #mod "puppetlabs/inifile", '1.5.0' #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' +mod "puppetlabs/stdlib", '4.12.0' +mod "puppetlabs/ruby", '0.4.0' +mod "puppetlabs/pe_gem", '0.2.0' +mod "puppetlabs/apt", '2.2.2' +mod "nanliu/staging", '1.0.3' +mod "puppetlabs/azure", '1.0.2' + # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples diff --git a/environment.conf b/environment.conf index 5ba929b..e6d9feb 100644 --- a/environment.conf +++ b/environment.conf @@ -1,2 +1,4 @@ modulepath = modules:site:$basemodulepath config_version = 'scripts/config_version.sh $environmentpath $environment' +environment_timeout = unlimited +##what now? diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 80bad3a..7b5a05c 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -3,3 +3,6 @@ message: "This node is using common data" #Puppet Server Tuning puppet_enterprise::master::puppetserver::jruby_max_requests_per_instance: 0 + +zabbix::repo::manage_repo: false +puppet_enterprise::master::puppetserver::environment-class-cache-enabled:false diff --git a/test b/test new file mode 100644 index 0000000..da2bbad --- /dev/null +++ b/test @@ -0,0 +1 @@ +new content! diff --git a/test2 b/test2 new file mode 100644 index 0000000..23aaebf --- /dev/null +++ b/test2 @@ -0,0 +1,3 @@ +new stuff!! + +yeah