Merge branch 'clean'

This commit is contained in:
Zach Leslie 2013-09-21 14:07:13 -07:00
commit a9b8e7b7e0
2 changed files with 4 additions and 14 deletions

View File

@ -6,4 +6,4 @@ license 'Apache License Version 2.0'
summary 'PkgNG package provider for FreeBSD'
description 'Includes facts and management class.'
project_page 'https://github.com/xaque208/puppet-pkgng'
dependency 'ripienaar/concat', '0.2.0'
dependency 'puppetlabs/stdlib'

View File

@ -20,18 +20,9 @@ class pkgng (
notify => Exec['pkg update'],
}
concat { "/etc/make.conf.local": }
concat::fragment { "pkgng in make.conf.local":
target => '/etc/make.conf.local',
content => "WITH_PKGNG=yes\n",
}
# This is not strictly needed
cron { "nighty_pkgng_update":
command => "/usr/local/sbin/pkg update -q",
minute => fqdn_rand(60),
hour => fqdn_rand(4),
require => File["/usr/local/etc/pkg.conf"],
file_line { "WITH_PKGNG":
path => '/etc/make.conf',
line => 'WITH_PKGNG=yes\n',
}
# Triggered on config changes
@ -55,5 +46,4 @@ class pkgng (
} else {
notice("pkgng is not supported on this release")
}
}