Showing with 5 additions and 12 deletions.
  1. +1 −1 Modulefile
  2. +4 −11 README.md
2 changes: 1 addition & 1 deletion Modulefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'zack-r10k'
version '2.4.1'
version '2.4.2'
source 'https://github.com/acidprime/r10k'
author 'zack'
license 'Apache License, Version 2.0'
Expand Down
15 changes: 4 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ git_deploy_key { 'add_deploy_key_to_puppet_control':
token => hiera('gitlab_api_token'),
project_name => 'puppet/control',
server_url => 'http://your.internal.gitlab.server.com',
provider => 'gitlab.com',
provider => 'gitlab',
}
```

Expand Down Expand Up @@ -88,7 +88,8 @@ is outlined below:
## symlink to r10k.yaml
These entries in Hiera will create a symlink at `/etc/r10k.yaml` that points to the config file at `/etc/puppet/r10k.yaml`

```
```yaml
---
r10k::configfile: /etc/puppet/r10k.yaml
r10k::manage_configfile_symlink: true
r10k::configfile_symlink: /etc/r10k.yaml
Expand Down Expand Up @@ -141,14 +142,6 @@ Ini_setting {
value => 'http://proxy.your.company.com:8080',
}

file { '/root/.gitconfig':
ensure => 'file',
owner => 'root',
group => '0',
mode => '0600',
}
ini_setting { 'git http proxy setting':
section => 'http',
setting => 'proxy',
Expand Down Expand Up @@ -284,7 +277,7 @@ git_webhook { 'web_post_receive_webhook' :
webhook_url => 'https://puppet:puppet@master.of.masters:8088/payload',
token => hiera('gitlab_api_token'),
project_name => 'puppet/controle',
server_url => 'http://github.com',
server_url => 'http://your.internal.gitlab.com',
provider => 'gitlab',
}
Expand Down