Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Puppet8 #121

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ and manage proxy settings with:
password: xxx # Optional
no_proxy:
- localhost
- "%{::domain}"
- "%{::fqdn}"
- "%{facts.networking.domain}"
- "%{facts.networking.fqdn}"
scheme: http

You can customise the components for which proxy should be configured, here are the default params:
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
# password: xxx # Optional
# no_proxy:
# - localhost
# - "%{::domain}"
# - "%{facts.networking.domain}"
# scheme: http
#
# @example Define arbitrary resources, with some defaults
Expand Down
2 changes: 1 addition & 1 deletion manifests/puppet/postrun.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
noop($noop_value)
}

$manage_content = tp_content($content, $template, $epp)
$manage_content = tp::content($content, $template, $epp)

File {
owner => 'root',
Expand Down
2 changes: 1 addition & 1 deletion manifests/services/init_script.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Optional[String] $service_ensure = undef,
Variant[Undef,Boolean,String] $service_enable = undef,
) {
$manage_content = tp_content($content, $template, $epp)
$manage_content = tp::content($content, $template, $epp)
file { "/etc/init.d/${title}":
ensure => $ensure,
content => $manage_content,
Expand Down
2 changes: 1 addition & 1 deletion manifests/services/systemd_script.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Optional[String] $systemd_after = 'network.target', # lint:ignore:optional_default
Optional[String] $systemd_before = undef,
) {
$manage_content = tp_content($content, $template, $epp)
$manage_content = tp::content($content, $template, $epp)
file { $path:
ensure => $ensure,
content => $manage_content,
Expand Down
6 changes: 1 addition & 5 deletions manifests/tools/create_dir.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,12 @@
Optional[String] $group = undef,
Optional[Stdlib::Filemode] $mode = undef,
Stdlib::AbsolutePath $path = $title,
Optional[String] $command_provider = undef,
) {
$mkdir_command = $facts['os']['family'] ? {
'windows' => "New-Item -ItemType Directory -Force -Path '${path}'",
default => "mkdir -p '${path}'",
}
$command_provider = $facts['os']['family'] ? {
'windows' => 'powershell',
default => undef,
}

exec { "Create directory ${title}":
command => $mkdir_command,
path => $facts['path'],
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/hiera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
:yaml:
:datadir: './spec/fixtures/hieradata'
:hierarchy:
- '%{::clientcert}'
- '%{trusted.certname}'
- 'common'

Loading