Commit fb1ee1a7 authored by Lance Albertson's avatar Lance Albertson
Browse files

Move concat setup to init

This should simplify this module a bit and rename the define to just
gentoo::makeconf.
parent 994b5fc4
class gentoo { class gentoo {
include concat::setup
# load all variables # load all variables
require gentoo::params require gentoo::params
...@@ -11,4 +12,17 @@ class gentoo { ...@@ -11,4 +12,17 @@ class gentoo {
$gentoo_portdir_overlay = $gentoo::params::portdir_overlay $gentoo_portdir_overlay = $gentoo::params::portdir_overlay
$gentoo_accept_license = $gentoo::params::accept_license $gentoo_accept_license = $gentoo::params::accept_license
$gentoo_emerge_opts = $gentoo::params::emerge_opts $gentoo_emerge_opts = $gentoo::params::emerge_opts
# make.conf
concat { "/etc/make.conf":
owner => root,
group => root,
mode => 644,
}
concat::fragment { "makeconf_base":
target => $makeconf,
content => template("gentoo/makeconf.base.conf.erb"),
order => 00,
}
} }
class gentoo::makeconf inherits gentoo { define gentoo::makeconf( $source="", $content="", comment="", $order=10,
ensure=present ) {
include concat::setup include concat::setup
$makeconf = "/etc/make.conf"
concat { $makeconf:
owner => root,
group => root,
mode => 644,
}
concat::fragment { "makeconf_base":
target => $makeconf,
content => template("gentoo/makeconf.base.conf.erb"),
order => 00,
}
}
define gentoo::makeconf::setting( $source="", $content="", comment="",
$order=10, ensure=present ) {
if $content { if $content {
concat::fragment { "makeconf_$name": concat::fragment { "makeconf_$name":
target => "/etc/make.conf", target => "/etc/make.conf",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment