From 1b6dc7dc0d2208f61df47f27a2340aa3bb88974b Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Tue, 10 May 2016 17:28:28 -0700 Subject: [PATCH 01/27] test symlink --- test.link | 1 + 1 file changed, 1 insertion(+) create mode 120000 test.link diff --git a/test.link b/test.link new file mode 120000 index 0000000..4901e7d --- /dev/null +++ b/test.link @@ -0,0 +1 @@ +environment.conf \ No newline at end of file From 5a099f6b4336362cd7ca008ea94cb7041f9015ce Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Tue, 10 May 2016 17:30:23 -0700 Subject: [PATCH 02/27] more test with symlink --- environment.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.conf b/environment.conf index 5ba929b..f8b1a88 100644 --- a/environment.conf +++ b/environment.conf @@ -1,2 +1,3 @@ modulepath = modules:site:$basemodulepath config_version = 'scripts/config_version.sh $environmentpath $environment' +##test somethign From 95caef446c66e855409400ed7487b84914343c39 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Tue, 10 May 2016 17:38:27 -0700 Subject: [PATCH 03/27] Update Puppetfile --- Puppetfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Puppetfile b/Puppetfile index b282b85..8509c60 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,5 +1,6 @@ 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' From cf2bed370e6d0adeea8749bcd5fab952f1154210 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Tue, 10 May 2016 17:51:25 -0700 Subject: [PATCH 04/27] more symlinks --- test2.link | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test2.link diff --git a/test2.link b/test2.link new file mode 100644 index 0000000..e69de29 From 3ed68b8b9d6caf31381983bb5144e962952f7b28 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 14:50:34 -0700 Subject: [PATCH 05/27] Update Puppetfile --- Puppetfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Puppetfile b/Puppetfile index 8509c60..ea78ee4 100644 --- a/Puppetfile +++ b/Puppetfile @@ -6,6 +6,7 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/inifile", '1.5.0' #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' +mod "puppet/zabbix", 'latest' # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 7822442995f84f007df4cd7ee6a6760bea69f6fb Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 14:52:30 -0700 Subject: [PATCH 06/27] Update Puppetfile --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index ea78ee4..13ec6e2 100644 --- a/Puppetfile +++ b/Puppetfile @@ -6,7 +6,7 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/inifile", '1.5.0' #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' -mod "puppet/zabbix", 'latest' +mod "puppet/zabbix", '2.3.0' # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 9c1f0a7ded6aabe625c3d6dceb189149ace3320c Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 14:59:42 -0700 Subject: [PATCH 07/27] Update Puppetfile --- Puppetfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Puppetfile b/Puppetfile index 13ec6e2..e936d87 100644 --- a/Puppetfile +++ b/Puppetfile @@ -7,6 +7,15 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' mod "puppet/zabbix", '2.3.0' +mod "puppetlabs-stdlib" '4.1.0' +mod "puppetlabs-ruby" '0.4.0' +mod "puppetlabs-postgresql" '4.0.0' +mod "puppetlabs-pe_gem" '0.1.0' +mod "puppetlabs-mysql" '2.0.0' +mod "puppetlabs-firewall" '1.0.0' +mod "puppetlabs-apt" '2.0.0' +mod "puppetlabs-apache" '1.0.0' + # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 0c44443f3aeca1e1d9f813b47f4a7dadc32d8747 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:00:25 -0700 Subject: [PATCH 08/27] Update Puppetfile --- Puppetfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Puppetfile b/Puppetfile index e936d87..da52acc 100644 --- a/Puppetfile +++ b/Puppetfile @@ -7,14 +7,14 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' mod "puppet/zabbix", '2.3.0' -mod "puppetlabs-stdlib" '4.1.0' -mod "puppetlabs-ruby" '0.4.0' -mod "puppetlabs-postgresql" '4.0.0' -mod "puppetlabs-pe_gem" '0.1.0' -mod "puppetlabs-mysql" '2.0.0' -mod "puppetlabs-firewall" '1.0.0' -mod "puppetlabs-apt" '2.0.0' -mod "puppetlabs-apache" '1.0.0' +mod "puppetlabs/stdlib" '4.1.0' +mod "puppetlabs/ruby" '0.4.0' +mod "puppetlabs/postgresql" '4.0.0' +mod "puppetlabs/pe_gem" '0.1.0' +mod "puppetlabs/mysql" '2.0.0' +mod "puppetlabs/firewall" '1.0.0' +mod "puppetlabs/apt" '2.0.0' +mod "puppetlabs/apache" '1.0.0' # Modules from Git From 63261100c4795309bd54cc55109823066461161d Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:01:22 -0700 Subject: [PATCH 09/27] Update Puppetfile --- Puppetfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Puppetfile b/Puppetfile index da52acc..d139de1 100644 --- a/Puppetfile +++ b/Puppetfile @@ -7,14 +7,14 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' mod "puppet/zabbix", '2.3.0' -mod "puppetlabs/stdlib" '4.1.0' -mod "puppetlabs/ruby" '0.4.0' -mod "puppetlabs/postgresql" '4.0.0' -mod "puppetlabs/pe_gem" '0.1.0' -mod "puppetlabs/mysql" '2.0.0' -mod "puppetlabs/firewall" '1.0.0' -mod "puppetlabs/apt" '2.0.0' -mod "puppetlabs/apache" '1.0.0' +mod "puppet/stdlib" '4.1.0' +mod "puppet/ruby" '0.4.0' +mod "puppet/postgresql" '4.0.0' +mod "puppet/pe_gem" '0.1.0' +mod "puppet/mysql" '2.0.0' +mod "puppet/firewall" '1.0.0' +mod "puppet/apt" '2.0.0' +mod "puppet/apache" '1.0.0' # Modules from Git From 5c2822bfac55c30344ce11024ca35c5723045564 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:02:20 -0700 Subject: [PATCH 10/27] Update Puppetfile --- Puppetfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Puppetfile b/Puppetfile index d139de1..f4f1f76 100644 --- a/Puppetfile +++ b/Puppetfile @@ -7,14 +7,14 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' mod "puppet/zabbix", '2.3.0' -mod "puppet/stdlib" '4.1.0' -mod "puppet/ruby" '0.4.0' -mod "puppet/postgresql" '4.0.0' -mod "puppet/pe_gem" '0.1.0' -mod "puppet/mysql" '2.0.0' -mod "puppet/firewall" '1.0.0' -mod "puppet/apt" '2.0.0' -mod "puppet/apache" '1.0.0' +mod "puppet/stdlib", '4.1.0' +mod "puppet/ruby", '0.4.0' +mod "puppet/postgresql", '4.0.0' +mod "puppet/pe_gem", '0.1.0' +mod "puppet/mysql", '2.0.0' +mod "puppet/firewall", '1.0.0' +mod "puppet/apt", '2.0.0' +mod "puppet/apache", '1.0.0' # Modules from Git From 4199e090510eb36e0e21acc40f9e7c1e10e4e1f3 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:03:16 -0700 Subject: [PATCH 11/27] Update Puppetfile --- Puppetfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Puppetfile b/Puppetfile index f4f1f76..4da3efc 100644 --- a/Puppetfile +++ b/Puppetfile @@ -7,14 +7,14 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' mod "puppet/zabbix", '2.3.0' -mod "puppet/stdlib", '4.1.0' -mod "puppet/ruby", '0.4.0' -mod "puppet/postgresql", '4.0.0' -mod "puppet/pe_gem", '0.1.0' -mod "puppet/mysql", '2.0.0' -mod "puppet/firewall", '1.0.0' -mod "puppet/apt", '2.0.0' -mod "puppet/apache", '1.0.0' +mod "puppetlabs/stdlib", '4.1.0' +mod "puppetlabs/ruby", '0.4.0' +mod "puppetlabs/postgresql", '4.0.0' +mod "puppetlabs/pe_gem", '0.1.0' +mod "puppetlabs/mysql", '2.0.0' +mod "puppetlabs/firewall", '1.0.0' +mod "puppetlabs/apt", '2.0.0' +mod "puppetlabs/apache", '1.0.0' # Modules from Git From f994148dd7dc64e396a319cd75417d1729ac23f4 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:16:13 -0700 Subject: [PATCH 12/27] Update Puppetfile --- Puppetfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Puppetfile b/Puppetfile index 4da3efc..e16a686 100644 --- a/Puppetfile +++ b/Puppetfile @@ -7,14 +7,15 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' mod "puppet/zabbix", '2.3.0' -mod "puppetlabs/stdlib", '4.1.0' +mod "puppetlabs/stdlib", '4.12.0' mod "puppetlabs/ruby", '0.4.0' -mod "puppetlabs/postgresql", '4.0.0' -mod "puppetlabs/pe_gem", '0.1.0' -mod "puppetlabs/mysql", '2.0.0' -mod "puppetlabs/firewall", '1.0.0' -mod "puppetlabs/apt", '2.0.0' -mod "puppetlabs/apache", '1.0.0' +mod "puppetlabs/postgresql", '4.7.1' +mod "puppetlabs/pe_gem", '0.2.0' +mod "puppetlabs/mysql", '3.7.0' +mod "puppetlabs/firewall", '1.8.0' +mod "puppetlabs/apt", '2.2.2' +mod "puppetlabs/apache", '1.9.0' +mod "nanliu/statging", '1.0.3' # Modules from Git From 452c49c464fc22071544474e89d580ab0ab10d25 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:21:15 -0700 Subject: [PATCH 13/27] Update Puppetfile --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index e16a686..78466c3 100644 --- a/Puppetfile +++ b/Puppetfile @@ -15,7 +15,7 @@ mod "puppetlabs/mysql", '3.7.0' mod "puppetlabs/firewall", '1.8.0' mod "puppetlabs/apt", '2.2.2' mod "puppetlabs/apache", '1.9.0' -mod "nanliu/statging", '1.0.3' +mod "nanliu/staging", '1.0.3' # Modules from Git From 5ebeacd5a18e651c8832f494700424931fa55454 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 11 May 2016 15:34:56 -0700 Subject: [PATCH 14/27] sdfasdf --- hieradata/common.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 80bad3a..78a764c 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -3,3 +3,5 @@ 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 From b3a2b46822d17790c3f74f58d2279edd4cd2fc89 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Thu, 12 May 2016 12:27:42 -0700 Subject: [PATCH 15/27] timeout --- environment.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.conf b/environment.conf index f8b1a88..5628aa1 100644 --- a/environment.conf +++ b/environment.conf @@ -1,3 +1,3 @@ modulepath = modules:site:$basemodulepath config_version = 'scripts/config_version.sh $environmentpath $environment' -##test somethign +environment_timeout = unlimited From 3f6f59ed8b846443395ee0bf29257e79dde6e8b6 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Thu, 12 May 2016 16:56:33 -0700 Subject: [PATCH 16/27] test --- test.link | 1 - test2.link | 0 2 files changed, 1 deletion(-) delete mode 120000 test.link delete mode 100644 test2.link diff --git a/test.link b/test.link deleted file mode 120000 index 4901e7d..0000000 --- a/test.link +++ /dev/null @@ -1 +0,0 @@ -environment.conf \ No newline at end of file diff --git a/test2.link b/test2.link deleted file mode 100644 index e69de29..0000000 From a109de302783dace667419329803f835b3a4aaaf Mon Sep 17 00:00:00 2001 From: suckatrash Date: Thu, 12 May 2016 16:58:21 -0700 Subject: [PATCH 17/27] Update environment.conf --- environment.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.conf b/environment.conf index 5628aa1..e6d9feb 100644 --- a/environment.conf +++ b/environment.conf @@ -1,3 +1,4 @@ modulepath = modules:site:$basemodulepath config_version = 'scripts/config_version.sh $environmentpath $environment' environment_timeout = unlimited +##what now? From 9eaeee159635e7f613152ec79065db9de4cbfef3 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Thu, 12 May 2016 17:10:05 -0700 Subject: [PATCH 18/27] barf --- test.link | 1 + 1 file changed, 1 insertion(+) create mode 120000 test.link diff --git a/test.link b/test.link new file mode 120000 index 0000000..4901e7d --- /dev/null +++ b/test.link @@ -0,0 +1 @@ +environment.conf \ No newline at end of file From eda4129a1dcfb97cf8b41e5a6bbdacbc72212830 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Thu, 12 May 2016 17:11:21 -0700 Subject: [PATCH 19/27] fooepsafd --- test.link | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 120000 => 100644 test.link diff --git a/test.link b/test.link deleted file mode 120000 index 4901e7d..0000000 --- a/test.link +++ /dev/null @@ -1 +0,0 @@ -environment.conf \ No newline at end of file diff --git a/test.link b/test.link new file mode 100644 index 0000000..37d4e6c --- /dev/null +++ b/test.link @@ -0,0 +1 @@ +hi there From 6d011fc6d3067452debc91b2cd95604985232dd9 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Thu, 12 May 2016 17:15:26 -0700 Subject: [PATCH 20/27] setsgafds --- test.link | 1 + 1 file changed, 1 insertion(+) diff --git a/test.link b/test.link index 37d4e6c..a44f810 100644 --- a/test.link +++ b/test.link @@ -1 +1,2 @@ hi there +daddio From 1f0c7e67914350355966af937539747afe466873 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Fri, 13 May 2016 10:02:15 -0700 Subject: [PATCH 21/27] test --- test.link | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 test.link diff --git a/test.link b/test.link deleted file mode 100644 index a44f810..0000000 --- a/test.link +++ /dev/null @@ -1,2 +0,0 @@ -hi there -daddio From 01c8ed1c8c6489902d3044292c559c9dfe1e178c Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 18 May 2016 09:43:37 -0700 Subject: [PATCH 22/27] changes!! --- Puppetfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Puppetfile b/Puppetfile index 78466c3..afb4382 100644 --- a/Puppetfile +++ b/Puppetfile @@ -6,16 +6,12 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/inifile", '1.5.0' #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' -mod "puppet/zabbix", '2.3.0' mod "puppetlabs/stdlib", '4.12.0' mod "puppetlabs/ruby", '0.4.0' -mod "puppetlabs/postgresql", '4.7.1' mod "puppetlabs/pe_gem", '0.2.0' -mod "puppetlabs/mysql", '3.7.0' -mod "puppetlabs/firewall", '1.8.0' mod "puppetlabs/apt", '2.2.2' -mod "puppetlabs/apache", '1.9.0' mod "nanliu/staging", '1.0.3' +mod "puppetlabs/azure", '1.0.2' # Modules from Git From a84863a22014137c9b454e6b687b876d9ec52a70 Mon Sep 17 00:00:00 2001 From: suckatrash Date: Wed, 18 May 2016 09:52:42 -0700 Subject: [PATCH 23/27] test --- hieradata/common.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 78a764c..7b5a05c 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -5,3 +5,4 @@ message: "This node is using common data" puppet_enterprise::master::puppetserver::jruby_max_requests_per_instance: 0 zabbix::repo::manage_repo: false +puppet_enterprise::master::puppetserver::environment-class-cache-enabled:false From a3c7bc41894b746116193c2c6847468df450f841 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Wed, 18 May 2016 10:33:31 -0700 Subject: [PATCH 24/27] test --- test | 1 + 1 file changed, 1 insertion(+) create mode 120000 test diff --git a/test b/test new file mode 120000 index 0000000..42061c0 --- /dev/null +++ b/test @@ -0,0 +1 @@ +README.md \ No newline at end of file From 08366a59c768b46803cfa0c787c572e431355832 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Wed, 18 May 2016 10:35:25 -0700 Subject: [PATCH 25/27] test2 --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 120000 => 100644 test diff --git a/test b/test deleted file mode 120000 index 42061c0..0000000 --- a/test +++ /dev/null @@ -1 +0,0 @@ -README.md \ No newline at end of file diff --git a/test b/test new file mode 100644 index 0000000..da2bbad --- /dev/null +++ b/test @@ -0,0 +1 @@ +new content! From 4964a45c6495c4d3a6e4a1762c58f00e139bac8a Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Wed, 18 May 2016 10:47:27 -0700 Subject: [PATCH 26/27] more --- test2 | 1 + 1 file changed, 1 insertion(+) create mode 120000 test2 diff --git a/test2 b/test2 new file mode 120000 index 0000000..42061c0 --- /dev/null +++ b/test2 @@ -0,0 +1 @@ +README.md \ No newline at end of file From 4d63aef870ce6ef5bf9fa181a52301a6180e5c52 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Wed, 18 May 2016 10:49:03 -0700 Subject: [PATCH 27/27] test --- test2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 120000 => 100644 test2 diff --git a/test2 b/test2 deleted file mode 120000 index 42061c0..0000000 --- a/test2 +++ /dev/null @@ -1 +0,0 @@ -README.md \ No newline at end of file diff --git a/test2 b/test2 new file mode 100644 index 0000000..23aaebf --- /dev/null +++ b/test2 @@ -0,0 +1,3 @@ +new stuff!! + +yeah