Skip to content
This repository has been archived by the owner on May 22, 2018. It is now read-only.

Commit

Permalink
Merge pull request #149 from boxen/high-sierra
Browse files Browse the repository at this point in the history
High Sierra compatibility
  • Loading branch information
jacobbednarz authored Mar 25, 2018
2 parents d5cfafb + e769b4a commit e7b2fdb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
4 changes: 0 additions & 4 deletions data/hiera.yaml

This file was deleted.

10 changes: 10 additions & 0 deletions hiera.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
version: 5
defaults:
datadir: data
data_hash: yaml_data
hierarchy:
- name: "OS family"
path: "%{::osfamily}.yaml"
- name: "common"
path: "common.yaml"
9 changes: 5 additions & 4 deletions manifests/osx_defaults.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
if (($type == undef) and (($value == true) or ($value == false))) or ($type =~ /^bool/) {
$type_ = 'bool'

$checkvalue = $value ? {
/(true|yes)/ => '1',
/(false|no)/ => '0',
case $value {
/'true'|true|'yes'|yes/: { $checkvalue = '1' }
/'false'|false|'no'|no/: { $checkvalue = '0' }
default: { $checkvalue = nil }
}

} else {
$type_ = $type
$checkvalue = $value
Expand All @@ -45,6 +45,7 @@

$readtype_cmd = shellquote($default_cmds, 'read-type', $domain, $key)
$checktype = $type_ ? {

/^bool$/ => 'boolean',
/^int$/ => 'integer',
/^dict$/ => 'dictionary',
Expand Down

0 comments on commit e7b2fdb

Please sign in to comment.