diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | hieradata/common.yaml | 2 | ||||
| -rw-r--r-- | site/role/manifests/all_in_one_pe_2015_2.pp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -72,7 +72,7 @@ http://docs.puppetlabs.com/pe/latest/regenerate_certs_master.html 2. After Gitlab is installed you may sign if with the `root` user and password `5iveL!fe` -3. Make an user for yourself +3. Make a user for yourself 4. Make an ssh key to link with your user. You’ll want to do this on the machine you intend to edit code from ( most likely not your puppet master but your local workstation / laptop ) - http://doc.gitlab.com/ce/ssh/README.html diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 8be38fe..291ad51 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -2,7 +2,7 @@ message: "This node is using common data" #Puppet Server Tuning -puppet_enterprise::master::puppetserver::jruby_max_requests_per_instance: 10000 +puppet_enterprise::master::puppetserver::jruby_max_requests_per_instance: 0 #Enable code manager puppet_enterprise::profile::master::code_manager_auto_configure: true puppet_enterprise::master::code_manager::authenticate_webhook: false diff --git a/site/role/manifests/all_in_one_pe_2015_2.pp b/site/role/manifests/all_in_one_pe_2015_2.pp index 01bf717..337ca45 100644 --- a/site/role/manifests/all_in_one_pe_2015_2.pp +++ b/site/role/manifests/all_in_one_pe_2015_2.pp @@ -1,6 +1,6 @@ class role::all_in_one_pe_2015_2 { include profile::puppetmaster - include profile::zack_r10k_webhook + include profile::git_webhook } |