tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing puppet-lint errors.

Browse source
This commit is contained in:
Timo Mkinen 2012-03-27 14:41:39 +03:00
parent 2f83cb7d4a
commit 34c36045fa
59 changed files with 995 additions and 990 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
abusehelper/manifests/init.pp
View file

@ -84,7 +84,7 @@ class abusehelper {
realize(User["abusehel"], Group["abusehel"]) realize(User["abusehel"], Group["abusehel"])
if $abusehelper_datadir { if $abusehelper_datadir {
file { "${abusehelper_datadir}": file { $abusehelper_datadir:
ensure => directory, ensure => directory,
mode => 0750, mode => 0750,
owner => "root", owner => "root",
@ -94,8 +94,8 @@ class abusehelper {
file { "/var/lib/ah2": file { "/var/lib/ah2":
ensure => link, ensure => link,
target => "${abusehelper_datadir}", target => $abusehelper_datadir,
require => File["${abusehelper_datadir}"], require => File[$abusehelper_datadir],
} }
} else { } else {
file { "/var/lib/ah2": file { "/var/lib/ah2":

2
alpine/manifests/init.pp
View file

@ -9,7 +9,7 @@ class alpine {
$mail_server = "mail.${domain}" $mail_server = "mail.${domain}"
} }
if ! $mail_domain { if ! $mail_domain {
$mail_domain = "${domain}" $mail_domain = $domain
} }
file { "/usr/bin/pine": file { "/usr/bin/pine":

4
amanda/manifests/init.pp
View file

@ -55,7 +55,7 @@ class amanda::client inherits amanda::common {
if $amanda_clientkey { if $amanda_clientkey {
@@ssh_authorized_key { "amrecover@${homename}": @@ssh_authorized_key { "amrecover@${homename}":
ensure => present, ensure => present,
key => "${amanda_clientkey}", key => $amanda_clientkey,
type => "ssh-rsa", type => "ssh-rsa",
user => "amandabackup", user => "amandabackup",
tag => "amandaclient", tag => "amandaclient",
@ -75,7 +75,7 @@ class amanda::server inherits amanda::common {
if $amanda_serverkey { if $amanda_serverkey {
@@ssh_authorized_key { "amdump@${homename}": @@ssh_authorized_key { "amdump@${homename}":
ensure => present, ensure => present,
key => "${amanda_serverkey}", key => $amanda_serverkey,
type => "ssh-rsa", type => "ssh-rsa",
user => "amandabackup", user => "amandabackup",
tag => "amandaserver", tag => "amandaserver",

22
apache/manifests/debian.pp
View file

@ -104,7 +104,7 @@ define apache::debian::site($aliases, $root, $redirect) {
file { "/srv/www/http/${site_fqdn}": file { "/srv/www/http/${site_fqdn}":
ensure => link, ensure => link,
target => $root, target => $root,
before => File["${site_conf}"], before => File[$site_conf],
} }
} else { } else {
file { "/srv/www/http/${site_fqdn}": file { "/srv/www/http/${site_fqdn}":
@ -112,7 +112,7 @@ define apache::debian::site($aliases, $root, $redirect) {
mode => 0755, mode => 0755,
owner => root, owner => root,
group => root, group => root,
before => File["${site_conf}"], before => File[$site_conf],
} }
} }
@ -121,12 +121,12 @@ define apache::debian::site($aliases, $root, $redirect) {
mode => 0755, mode => 0755,
owner => root, owner => root,
group => root, group => root,
before => File["${site_conf}"], before => File[$site_conf],
} }
} }
} }
file { "${site_conf}": file { $site_conf:
ensure => present, ensure => present,
mode => 0644, mode => 0644,
owner => root, owner => root,
@ -135,14 +135,14 @@ define apache::debian::site($aliases, $root, $redirect) {
} }
if $redirect { if $redirect {
File["${site_conf}"] { File[$site_conf] {
content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n", content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n",
} }
} else { } else {
File["${site_conf}"] { File[$site_conf] {
content => template("apache/site.http.conf.erb"), content => template("apache/site.http.conf.erb"),
} }
file { "${site_confdir}": file { $site_confdir:
ensure => directory, ensure => directory,
mode => 0644, mode => 0644,
owner => root, owner => root,
@ -152,7 +152,7 @@ define apache::debian::site($aliases, $root, $redirect) {
recurse => true, recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}", source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///modules/custom/empty", ], "puppet:///modules/custom/empty", ],
before => File["${site_conf}"], before => File[$site_conf],
notify => Service["apache2"], notify => Service["apache2"],
} }
} }
@ -256,7 +256,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
$site_conf = "/etc/apache2/sites-enabled/${site_fqdn}-ssl.conf" $site_conf = "/etc/apache2/sites-enabled/${site_fqdn}-ssl.conf"
$site_confdir = "/etc/apache2/sites-enabled/${site_fqdn}-ssl.d" $site_confdir = "/etc/apache2/sites-enabled/${site_fqdn}-ssl.d"
file { "${site_conf}": file { $site_conf:
ensure => present, ensure => present,
content => template("apache/site.https.conf.erb"), content => template("apache/site.https.conf.erb"),
mode => 0644, mode => 0644,
@ -267,7 +267,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
File["/etc/ssl/private/${site_fqdn}.key"], ], File["/etc/ssl/private/${site_fqdn}.key"], ],
} }
file { "${site_confdir}": file { $site_confdir:
ensure => directory, ensure => directory,
mode => 0644, mode => 0644,
owner => root, owner => root,
@ -277,7 +277,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
recurse => true, recurse => true,
source => [ "puppet:///files/apache/sslsites/${site_fqdn}", source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
"puppet:///modules/custom/empty", ], "puppet:///modules/custom/empty", ],
before => File["${site_conf}"], before => File[$site_conf],
notify => Service["apache2"], notify => Service["apache2"],
} }

36
apache/manifests/init.pp
View file

@ -21,7 +21,7 @@ class apache::common {
} }
if $apache_datadir { if $apache_datadir {
file { "${apache_datadir}": file { $apache_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => "root", owner => "root",
@ -31,8 +31,8 @@ class apache::common {
file { "/srv/www": file { "/srv/www":
ensure => link, ensure => link,
target => "${apache_datadir}", target => $apache_datadir,
require => File["${apache_datadir}"], require => File[$apache_datadir],
} }
} else { } else {
file { "/srv/www": file { "/srv/www":
@ -55,7 +55,7 @@ class apache::common {
if $apache_datadir { if $apache_datadir {
selinux::manage_fcontext { "${apache_datadir}(/.*)?": selinux::manage_fcontext { "${apache_datadir}(/.*)?":
type => "httpd_sys_content_t", type => "httpd_sys_content_t",
before => File["${apache_datadir}"], before => File[$apache_datadir],
} }
} }
} }
@ -155,14 +155,14 @@ define apache::site($aliases="", $root="", $redirect="") {
case $operatingsystem { case $operatingsystem {
debian,ubuntu: { debian,ubuntu: {
apache::debian::site { "${name}": apache::debian::site { $name:
aliases => $aliases, aliases => $aliases,
root => $root, root => $root,
redirect => $redirect, redirect => $redirect,
} }
} }
centos,fedora: { centos,fedora: {
apache::redhat::site { "${name}": apache::redhat::site { $name:
aliases => $aliases, aliases => $aliases,
root => $root, root => $root,
redirect => $redirect, redirect => $redirect,
@ -175,8 +175,8 @@ define apache::site($aliases="", $root="", $redirect="") {
if !$redirect { if !$redirect {
$site_fqdn = $name ? { $site_fqdn = $name ? {
"default" => "${homename}", "default" => $homename,
default => "${name}", default => $name,
} }
apache::webalizer::site { "http/${site_fqdn}": apache::webalizer::site { "http/${site_fqdn}":
site_proto => "http", site_proto => "http",
@ -268,7 +268,7 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
case $operatingsystem { case $operatingsystem {
debian,ubuntu: { debian,ubuntu: {
$apache_ssldir = "/etc/ssl" $apache_ssldir = "/etc/ssl"
apache::debian::sslsite { "${name}": apache::debian::sslsite { $name:
ipaddr => $ipaddr, ipaddr => $ipaddr,
root => $root, root => $root,
ssl_cert => $ssl_cert, ssl_cert => $ssl_cert,
@ -279,7 +279,7 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
} }
centos,fedora: { centos,fedora: {
$apache_ssldir = "/etc/pki/tls" $apache_ssldir = "/etc/pki/tls"
apache::redhat::sslsite { "${name}": apache::redhat::sslsite { $name:
ipaddr => $ipaddr, ipaddr => $ipaddr,
root => $root, root => $root,
ssl_cert => $ssl_cert, ssl_cert => $ssl_cert,
@ -294,8 +294,8 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
} }
$site_fqdn = $name ? { $site_fqdn = $name ? {
"default" => "${homename}", "default" => $homename,
default => "${name}", default => $name,
} }
apache::webalizer::site { "https/${site_fqdn}": apache::webalizer::site { "https/${site_fqdn}":
site_proto => "https", site_proto => "https",
@ -335,17 +335,17 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
case $operatingsystem { case $operatingsystem {
debian,ubuntu: { debian,ubuntu: {
apache::debian::configfile { "${name}": apache::debian::configfile { $name:
source => "${source}", source => $source,
content => "${content}", content => $content,
http => $http, http => $http,
https => $https, https => $https,
} }
} }
centos,fedora: { centos,fedora: {
apache::redhat::configfile { "${name}": apache::redhat::configfile { $name:
source => "${source}", source => $source,
content => "${content}", content => $content,
http => $http, http => $http,
https => $https, https => $https,
} }

22
apache/manifests/redhat.pp
View file

@ -57,7 +57,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
file { "/srv/www/http/${site_fqdn}": file { "/srv/www/http/${site_fqdn}":
ensure => link, ensure => link,
target => $root, target => $root,
before => File["${site_conf}"], before => File[$site_conf],
} }
} else { } else {
file { "/srv/www/http/${site_fqdn}": file { "/srv/www/http/${site_fqdn}":
@ -65,7 +65,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
mode => 0755, mode => 0755,
owner => root, owner => root,
group => root, group => root,
before => File["${site_conf}"], before => File[$site_conf],
} }
} }
@ -74,12 +74,12 @@ define apache::redhat::site($aliases, $root, $redirect) {
mode => 0755, mode => 0755,
owner => root, owner => root,
group => root, group => root,
before => File["${site_conf}"], before => File[$site_conf],
} }
} }
} }
file { "${site_conf}": file { $site_conf:
ensure => present, ensure => present,
mode => 0644, mode => 0644,
owner => root, owner => root,
@ -88,14 +88,14 @@ define apache::redhat::site($aliases, $root, $redirect) {
} }
if $redirect { if $redirect {
File["${site_conf}"] { File[$site_conf] {
content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n", content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n",
} }
} else { } else {
File["${site_conf}"] { File[$site_conf] {
content => template("apache/site.http.conf.erb"), content => template("apache/site.http.conf.erb"),
} }
file { "${site_confdir}": file { $site_confdir:
ensure => directory, ensure => directory,
mode => 0644, mode => 0644,
owner => root, owner => root,
@ -105,7 +105,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
recurse => true, recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}", source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///modules/custom/empty", ], "puppet:///modules/custom/empty", ],
before => File["${site_conf}"], before => File[$site_conf],
notify => Service["httpd"], notify => Service["httpd"],
} }
} }
@ -257,7 +257,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
$site_conf = "/etc/httpd/site.https.d/${site_fqdn}.conf" $site_conf = "/etc/httpd/site.https.d/${site_fqdn}.conf"
$site_confdir = "/etc/httpd/site.https.d/${site_fqdn}.d" $site_confdir = "/etc/httpd/site.https.d/${site_fqdn}.d"
file { "${site_conf}": file { $site_conf:
ensure => present, ensure => present,
content => template("apache/site.https.conf.erb"), content => template("apache/site.https.conf.erb"),
mode => 0644, mode => 0644,
@ -268,7 +268,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
File["/etc/pki/tls/private/${site_fqdn}.key"], ], File["/etc/pki/tls/private/${site_fqdn}.key"], ],
} }
file { "${site_confdir}": file { $site_confdir:
ensure => directory, ensure => directory,
mode => 0644, mode => 0644,
owner => root, owner => root,
@ -278,7 +278,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
recurse => true, recurse => true,
source => [ "puppet:///files/apache/sslsites/${site_fqdn}", source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
"puppet:///modules/custom/empty", ], "puppet:///modules/custom/empty", ],
before => File["${site_conf}"], before => File[$site_conf],
notify => Service["httpsd"], notify => Service["httpsd"],
} }

2
apt/manifests/init.pp
View file

@ -223,7 +223,7 @@ define apt::package($ensure, $source) {
require => File["/var/cache/apt/local-archives"], require => File["/var/cache/apt/local-archives"],
} }
package { "${name}": package { $name:
ensure => $ensure, ensure => $ensure,
source => "/var/cache/apt/local-archives/${filename}", source => "/var/cache/apt/local-archives/${filename}",
provider => dpkg, provider => dpkg,

12
backuppc/manifests/init.pp
View file

@ -17,7 +17,7 @@
define backuppc::manualclient($ensure = "present", $operatingsystem = "default") { define backuppc::manualclient($ensure = "present", $operatingsystem = "default") {
@@file { "/etc/BackupPC/pc/${name}.pl": @@file { "/etc/BackupPC/pc/${name}.pl":
ensure => "${ensure}", ensure => $ensure,
source => [ "puppet:///files/backuppc/${name}.pl", source => [ "puppet:///files/backuppc/${name}.pl",
"puppet:///files/backuppc/${operatingsystem}.pl", "puppet:///files/backuppc/${operatingsystem}.pl",
"puppet:///files/backuppc/default.pl", "puppet:///files/backuppc/default.pl",
@ -36,9 +36,9 @@ define backuppc::manualclient($ensure = "present", $operatingsystem = "default")
# #
class backuppc::client { class backuppc::client {
backuppc::manualclient { "${homename}": backuppc::manualclient { $homename:
ensure => present, ensure => present,
operatingsystem => "${operatingsystem}", operatingsystem => $operatingsystem,
} }
include rsync include rsync
@ -63,7 +63,7 @@ class backuppc::server {
} }
if $backuppc_datadir { if $backuppc_datadir {
file { "${backuppc_datadir}": file { $backuppc_datadir:
ensure => directory, ensure => directory,
mode => 0750, mode => 0750,
owner => "backuppc", owner => "backuppc",
@ -72,10 +72,10 @@ class backuppc::server {
} }
file { "/var/lib/BackupPC": file { "/var/lib/BackupPC":
ensure => "${backuppc_datadir}", ensure => $backuppc_datadir,
force => true, force => true,
backup => ".orig", backup => ".orig",
require => File["${backuppc_datadir}"], require => File[$backuppc_datadir],
before => File["/var/lib/BackupPC/.ssh"], before => File["/var/lib/BackupPC/.ssh"],
} }
} }

6
clarified/manifests/init.pp
View file

@ -49,7 +49,7 @@ class clarified::recorder {
} }
if $recorder_datadir { if $recorder_datadir {
file { "${recorder_datadir}": file { $recorder_datadir:
ensure => directory, ensure => directory,
mode => 0700, mode => 0700,
owner => root, owner => root,
@ -58,8 +58,8 @@ class clarified::recorder {
file { "/var/lib/recorder": file { "/var/lib/recorder":
ensure => link, ensure => link,
target => "${recorder_datadir}", target => $recorder_datadir,
require => File["${recorder_datadir}"], require => File[$recorder_datadir],
} }
} else { } else {
file { "/var/lib/recorder": file { "/var/lib/recorder":

34
custom/manifests/init.pp
View file

@ -50,9 +50,9 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp
$test = regsubst($source, '^([^:]+)://.+$', '\1') $test = regsubst($source, '^([^:]+)://.+$', '\1')
if "${test}" == "${source}" { if "${test}" == "${source}" {
$method = "file" $method = "file"
$path = "${source}" $path = $source
} else { } else {
$method = "${test}" $method = $test
} }
case $method { case $method {
@ -75,33 +75,33 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp
cwd => regsubst($name, '(.*)/[^/]+$', '\1'), cwd => regsubst($name, '(.*)/[^/]+$', '\1'),
command => $fetch_cmd, command => $fetch_cmd,
unless => $diff_cmd, unless => $diff_cmd,
before => File["${name}"], before => File[$name],
} }
} }
} }
file { "${name}": file { $name:
ensure => "${ensure}", ensure => $ensure,
source => "${method}" ? { source => $method ? {
"file" => "${path}", "file" => $path,
"puppet" => "${source}", "puppet" => $source,
default => undef, default => undef,
}, },
mode => "${mode}" ? { mode => $mode ? {
"NONE" => undef, "NONE" => undef,
default => "${mode}", default => $mode,
}, },
owner => "${owner}" ? { owner => $owner ? {
"NONE" => undef, "NONE" => undef,
default => "${owner}", default => $owner,
}, },
group => "${group}" ? { group => $group ? {
"NONE" => undef, "NONE" => undef,
default => "${group}", default => $group,
}, },
seltype => "${seltype}" ? { seltype => $seltype ? {
"NONE" => undef, "NONE" => undef,
default => "${seltype}", default => $seltype,
}, },
} }
@ -132,7 +132,7 @@ class custom::rootpassword {
default: { default: {
user { "root": user { "root":
ensure => present, ensure => present,
password => "${root_password}", password => $root_password,
} }
} }
} }

2
dns/manifests/init.pp
View file

@ -111,8 +111,8 @@ class dns::server {
} }
file { "named.conf": file { "named.conf":
path => "${chroot}${config}",
ensure => present, ensure => present,
path => "${chroot}${config}",
mode => 0640, mode => 0640,
owner => "root", owner => "root",
group => $group, group => $group,

6
ejabberd/manifests/init.pp
View file

@ -26,7 +26,7 @@ class ejabberd {
realize(User["ejabberd"], Group["ejabberd"]) realize(User["ejabberd"], Group["ejabberd"])
if !$ejabberd_hosts { if !$ejabberd_hosts {
$ejabberd_hosts = [ "${homename}" ] $ejabberd_hosts = [ $homename ]
} }
if !$ejabberd_admin { if !$ejabberd_admin {
$ejabberd_admin = [] $ejabberd_admin = []
@ -213,7 +213,7 @@ class ejabberd::backup {
$ejabberd_backup_datadir = "/srv/ejabberd-backup" $ejabberd_backup_datadir = "/srv/ejabberd-backup"
} }
file { "${ejabberd_backup_datadir}": file { $ejabberd_backup_datadir:
ensure => directory, ensure => directory,
mode => 0700, mode => 0700,
owner => root, owner => root,
@ -234,7 +234,7 @@ class ejabberd::backup {
user => "root", user => "root",
minute => 15, minute => 15,
hour => 21, hour => 21,
require => File[ "${ejabberd_backup_datadir}", require => File[ $ejabberd_backup_datadir,
"/usr/local/sbin/ejabberd-backup" ], "/usr/local/sbin/ejabberd-backup" ],
} }

8
git/manifests/init.pp
View file

@ -26,7 +26,7 @@ class git::server {
include git::client include git::client
if $git_datadir { if $git_datadir {
file { "${git_datadir}": file { $git_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => root, owner => root,
@ -34,8 +34,8 @@ class git::server {
} }
file { "/srv/git": file { "/srv/git":
ensure => link, ensure => link,
target => "${git_datadir}", target => $git_datadir,
require => File["${git_datadir}"], require => File[$git_datadir],
} }
} else { } else {
file { "/srv/git": file { "/srv/git":
@ -55,7 +55,7 @@ class git::server {
if $git_datadir { if $git_datadir {
selinux::manage_fcontext { "${git_datadir}(/.*)?": selinux::manage_fcontext { "${git_datadir}(/.*)?":
type => "httpd_sys_content_t", type => "httpd_sys_content_t",
before => File["${git_datadir}"], before => File[$git_datadir],
} }
} }
} }

6
hastymail/manifests/init.pp
View file

@ -28,7 +28,7 @@ class hastymail {
ensure => directory, ensure => directory,
mode => 0750, mode => 0750,
owner => "root", owner => "root",
group => "${apache::sslserver::group}", group => $apache::sslserver::group,
} }
file { "/etc/hastymail2/hastymail2.conf": file { "/etc/hastymail2/hastymail2.conf":
ensure => present, ensure => present,
@ -36,7 +36,7 @@ class hastymail {
"puppet:///files/mail/hastymail2.conf", ], "puppet:///files/mail/hastymail2.conf", ],
mode => 0640, mode => 0640,
owner => "root", owner => "root",
group => "${apache::sslserver::group}", group => $apache::sslserver::group,
require => File["/etc/hastymail2"], require => File["/etc/hastymail2"],
} }
exec { "rm /etc/hastymail2/hastymail2.rc && php /usr/local/share/hastymail/install_scripts/install_config.php /etc/hastymail2/hastymail2.conf /etc/hastymail2/hastymail2.rc": exec { "rm /etc/hastymail2/hastymail2.rc && php /usr/local/share/hastymail/install_scripts/install_config.php /etc/hastymail2/hastymail2.conf /etc/hastymail2/hastymail2.rc":
@ -50,7 +50,7 @@ class hastymail {
ensure => present, ensure => present,
mode => 0640, mode => 0640,
owner => "root", owner => "root",
group => "${apache::sslserver::group}", group => $apache::sslserver::group,
} }
} }

2
inetd/manifests/init.pp
View file

@ -76,7 +76,7 @@ define inetd::service($ensure = present) {
case $operatingsystem { case $operatingsystem {
centos,fedora,ubuntu,debian: { centos,fedora,ubuntu,debian: {
service { "${name}": service { $name:
enable => $ensure ? { enable => $ensure ? {
present => true, present => true,
absent => false, absent => false,

2
irc/manifests/init.pp
View file

@ -67,7 +67,7 @@ define irc::network($desc, $servername, $serverdesc,
} }
ssl::certificate { "/var/lib/ratbox/${name}/ircd.pem": ssl::certificate { "/var/lib/ratbox/${name}/ircd.pem":
cn => "${servername}", cn => $servername,
mode => 0600, mode => 0600,
owner => "irc", owner => "irc",
group => "irc", group => "irc",

8
kerberos/manifests/init.pp
View file

@ -191,12 +191,12 @@ define kerberos::keytab($principals = [], $ensure = present, $owner = "root", $g
} }
} }
file { "${name}": file { $name:
ensure => $ensure, ensure => $ensure,
content => template("kerberos/keytab.erb"), content => template("kerberos/keytab.erb"),
mode => "${mode}", mode => $mode,
owner => "${owner}", owner => $owner,
group => "${real_group}", group => $real_group,
} }
} }

14
ldap/manifests/init.pp
View file

@ -273,8 +273,8 @@ class ldap::client::ruby {
} }
package { "ruby-ldap": package { "ruby-ldap":
name => $pkgname,
ensure => installed, ensure => installed,
name => $pkgname,
} }
} }
@ -346,8 +346,8 @@ class ldap::server {
} }
package { "openldap-server": package { "openldap-server":
name => $package_name,
ensure => installed, ensure => installed,
name => $package_name,
} }
file { "${ssl::certs}/slapd.crt": file { "${ssl::certs}/slapd.crt":
@ -373,8 +373,8 @@ class ldap::server {
} }
file { "slapd.conf": file { "slapd.conf":
path => "${config}/slapd.conf",
ensure => present, ensure => present,
path => "${config}/slapd.conf",
content => template("ldap/slapd.conf.erb"), content => template("ldap/slapd.conf.erb"),
mode => 0640, mode => 0640,
owner => "root", owner => "root",
@ -418,7 +418,7 @@ class ldap::server {
} }
if $ldap_datadir { if $ldap_datadir {
file { "${ldap_datadir}": file { $ldap_datadir:
ensure => directory, ensure => directory,
mode => 0700, mode => 0700,
owner => $user, owner => $user,
@ -427,8 +427,8 @@ class ldap::server {
} }
file { "/srv/ldap": file { "/srv/ldap":
ensure => link, ensure => link,
target => "${ldap_datadir}", target => $ldap_datadir,
require => File["${ldap_datadir}"], require => File[$ldap_datadir],
} }
} else { } else {
file { "/srv/ldap": file { "/srv/ldap":
@ -587,8 +587,8 @@ define ldap::server::schema($idx = 50) {
include ldap::server include ldap::server
file { "${name}.schema": file { "${name}.schema":
path => "${ldap::server::config}/schema/${idx}-${name}.schema",
ensure => present, ensure => present,
path => "${ldap::server::config}/schema/${idx}-${name}.schema",
source => [ "puppet:///files/ldap/${name}.schema", source => [ "puppet:///files/ldap/${name}.schema",
"puppet:///modules/ldap/${name}.schema", ], "puppet:///modules/ldap/${name}.schema", ],
mode => 0644, mode => 0644,

4
mercurial/manifests/init.pp
View file

@ -24,13 +24,13 @@ define mercurial::clone($source, $ensure="tip") {
exec { "hg-clone-${name}": exec { "hg-clone-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "hg -y clone -r ${ensure} ${source} ${name}", command => "hg -y clone -r ${ensure} ${source} ${name}",
creates => "${name}", creates => $name,
require => Package["mercurial"], require => Package["mercurial"],
} }
exec { "hg-pull-${name}": exec { "hg-pull-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => "${name}", cwd => $name,
command => "hg -y pull -u -r ${ensure}", command => "hg -y pull -u -r ${ensure}",
onlyif => $ensure ? { onlyif => $ensure ? {
"tip" => "hg -y in", "tip" => "hg -y in",

18
munin/manifests/init.pp
View file

@ -45,8 +45,8 @@ class munin::node {
} }
@@file { "/etc/munin/nodes.d/${homename}.conf": @@file { "/etc/munin/nodes.d/${homename}.conf":
content => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n",
ensure => present, ensure => present,
content => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n",
tag => "munin", tag => "munin",
notify => Exec["generate-munin-conf"], notify => Exec["generate-munin-conf"],
} }
@ -82,8 +82,8 @@ class munin::node {
define munin::snmpnode($snmp_community="public", $snmp_version="2") { define munin::snmpnode($snmp_community="public", $snmp_version="2") {
file { "/etc/munin/plugin-conf.d/snmp_${name}": file { "/etc/munin/plugin-conf.d/snmp_${name}":
content => "[snmp_${name}_*]\nenv.community ${snmp_community}\nenv.version ${snmp_version}\n",
ensure => present, ensure => present,
content => "[snmp_${name}_*]\nenv.community ${snmp_community}\nenv.version ${snmp_version}\n",
owner => root, owner => root,
group => $operatingsystem ? { group => $operatingsystem ? {
OpenBSD => wheel, OpenBSD => wheel,
@ -94,8 +94,8 @@ define munin::snmpnode($snmp_community="public", $snmp_version="2") {
} }
@@file { "/etc/munin/nodes.d/${name}.conf": @@file { "/etc/munin/nodes.d/${name}.conf":
content => "[${name}]\n address ${ipaddress}\n use_node_name no\n",
ensure => present, ensure => present,
content => "[${name}]\n address ${ipaddress}\n use_node_name no\n",
tag => "munin", tag => "munin",
notify => Exec["generate-munin-conf"], notify => Exec["generate-munin-conf"],
} }
@ -204,7 +204,7 @@ class munin::server {
} }
if $munin_datadir { if $munin_datadir {
file { "${munin_datadir}": file { $munin_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => munin, owner => munin,
@ -220,15 +220,15 @@ class munin::server {
} }
file { "/var/lib/munin": file { "/var/lib/munin":
ensure => "${munin_datadir}", ensure => $munin_datadir,
force => true, force => true,
backup => ".orig", backup => ".orig",
require => File["${munin_datadir}"], require => File[$munin_datadir],
} }
} }
if $munin_htmldir { if $munin_htmldir {
file { "${munin_htmldir}": file { $munin_htmldir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => munin, owner => munin,
@ -248,11 +248,11 @@ class munin::server {
} }
file { "/var/www/html/munin": file { "/var/www/html/munin":
ensure => "${munin_htmldir}", ensure => $munin_htmldir,
force => true, force => true,
backup => ".orig", backup => ".orig",
seltype => "munin_var_lib_t", seltype => "munin_var_lib_t",
require => File["${munin_htmldir}"], require => File[$munin_htmldir],
} }
} }

4
mutt/manifests/init.pp
View file

@ -9,7 +9,7 @@ class mutt {
$mail_server = "mail.${domain}" $mail_server = "mail.${domain}"
} }
if ! $mail_domain { if ! $mail_domain {
$mail_domain = "${domain}" $mail_domain = $domain
} }
case $operatingsystem { case $operatingsystem {
@ -26,8 +26,8 @@ class mutt {
} }
file { "Muttrc.local": file { "Muttrc.local":
name => "${muttconfdir}/Muttrc.local",
ensure => present, ensure => present,
name => "${muttconfdir}/Muttrc.local",
content => template("mutt/Muttrc.local.erb"), content => template("mutt/Muttrc.local.erb"),
mode => 0644, mode => 0644,
owner => root, owner => root,

8
mysql/manifests/init.pp
View file

@ -24,7 +24,7 @@ class mysql::server {
} }
if $mysql_datadir { if $mysql_datadir {
file { "${mysql_datadir}": file { $mysql_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => mysql, owner => mysql,
@ -34,9 +34,9 @@ class mysql::server {
} }
file { "/srv/mysql": file { "/srv/mysql":
ensure => link, ensure => link,
target => "${mysql_datadir}", target => $mysql_datadir,
seltype => "mysqld_db_t", seltype => "mysqld_db_t",
require => File["${mysql_datadir}"], require => File[$mysql_datadir],
} }
} else { } else {
file { "/srv/mysql": file { "/srv/mysql":
@ -57,7 +57,7 @@ class mysql::server {
if $mysql_datadir { if $mysql_datadir {
selinux::manage_fcontext { "${mysql_datadir}(/.*)?": selinux::manage_fcontext { "${mysql_datadir}(/.*)?":
type => "mysqld_db_t", type => "mysqld_db_t",
before => File["${mysql_datadir}"], before => File[$mysql_datadir],
} }
} }
} }

3
mythtv/manifests/init.pp
View file

@ -72,7 +72,8 @@ class mythtv::backend {
} }
file { "/root/.mythtv": file { "/root/.mythtv":
ensure => "/etc/mythtv", ensure => link,
target => "/etc/mythtv",
force => true, force => true,
require => Package["mythtv-backend"], require => Package["mythtv-backend"],
} }

12
network/manifests/init.pp
View file

@ -258,7 +258,7 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
file { "/etc/mygate": file { "/etc/mygate":
ensure => present, ensure => present,
content => template("network/mygate.erb"), content => template("network/mygate.erb"),
mode => 644, mode => 0644,
owner => root, owner => root,
group => wheel, group => wheel,
notify => Exec["restart-network"], notify => Exec["restart-network"],
@ -335,8 +335,8 @@ define network::carp($password, $ipaddr, $netmask, $options = []) {
case $operatingsystem { case $operatingsystem {
openbsd: { openbsd: {
network::interface { "carp${name}": network::interface { "carp${name}":
ipaddr => "${ipaddr}", ipaddr => $ipaddr,
netmask => "${netmask}", netmask => $netmask,
options => [ "vhid ${name}", "pass ${password}", $options ], options => [ "vhid ${name}", "pass ${password}", $options ],
postcmd => [ "/usr/sbin/ndp -i carp${name} -- -accept_rtadv" ], postcmd => [ "/usr/sbin/ndp -i carp${name} -- -accept_rtadv" ],
} }
@ -449,11 +449,11 @@ define network::trunk($devices, $mode = 0, $ipaddr = "none", $netmask = "none")
network::interface { $devices: network::interface { $devices:
options => [ "MASTER=${name}", "SLAVE=yes", ], options => [ "MASTER=${name}", "SLAVE=yes", ],
require => File["/etc/modprobe.d/${name}.conf"], require => File["/etc/modprobe.d/${name}.conf"],
before => Network::Interface["${name}"], before => Network::Interface[$name],
} }
network::interface { $name: network::interface { $name:
ipaddr => "${ipaddr}", ipaddr => $ipaddr,
netmask => "${netmask}", netmask => $netmask,
} }
} }
default: { default: {

2
nginx/manifests/init.pp
View file

@ -18,8 +18,8 @@ class nginx {
} }
service { "nginx": service { "nginx":
enable => true,
ensure => running, ensure => running,
enable => true,
require => Package["nginx"], require => Package["nginx"],
} }

8
puppet/manifests/init.pp
View file

@ -26,8 +26,8 @@ class puppet::client {
} }
ubuntu,debian: { ubuntu,debian: {
package { "libaugeas-ruby": package { "libaugeas-ruby":
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
ensure => installed, ensure => installed,
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
before => Service["puppet"], before => Service["puppet"],
} }
} }
@ -259,7 +259,7 @@ class puppet::server::common inherits puppet::client {
} }
if $puppet_datadir { if $puppet_datadir {
file { "${puppet_datadir}": file { $puppet_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => root, owner => root,
@ -272,9 +272,9 @@ class puppet::server::common inherits puppet::client {
} }
file { "/srv/puppet": file { "/srv/puppet":
ensure => link, ensure => link,
target => "${puppet_datadir}", target => $puppet_datadir,
seltype => "var_lib_t", seltype => "var_lib_t",
require => File["${puppet_datadir}"], require => File[$puppet_datadir],
} }
} else { } else {
file { "/srv/puppet": file { "/srv/puppet":

2
python/manifests/init.pp
View file

@ -15,7 +15,7 @@ define python::setup::install($python="python") {
exec { "python-setup-install-${name}": exec { "python-setup-install-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
cwd => "${name}", cwd => $name,
command => "${python} setup.py install", command => "${python} setup.py install",
creates => "${name}/build", creates => "${name}/build",
} }

5
saslauthd/manifests/init.pp
View file

@ -43,8 +43,9 @@ class saslauthd::server {
define saslauthd::service() { define saslauthd::service() {
case $architecture { case $architecture {
i386: { $libdir = "/usr/lib/sasl2" } "i386": { $libdir = "/usr/lib/sasl2" }
x86_64: { $libdir = "/usr/lib64/sasl2" } "x86_64": { $libdir = "/usr/lib64/sasl2" }
default: { fail("Unknown architecture ${architecture}")
} }
file { "${libdir}/${name}.conf": file { "${libdir}/${name}.conf":

8
sendmail/manifests/init.pp
View file

@ -8,8 +8,8 @@ class sendmail::common {
if $operatingsystem != "OpenBSD" { if $operatingsystem != "OpenBSD" {
package { "sendmail": package { "sendmail":
name => [ "sendmail", "sendmail-cf", ],
ensure => installed, ensure => installed,
name => [ "sendmail", "sendmail-cf", ],
} }
service { "sendmail": service { "sendmail":
ensure => running, ensure => running,
@ -133,9 +133,11 @@ class sendmail::server inherits sendmail::common {
} }
} }
file { "sendmail.mc": name => $operatingsystem ? { file { "sendmail.mc":
name => $operatingsystem ? {
"openbsd" => "/usr/share/sendmail/cf/sendmail.mc", "openbsd" => "/usr/share/sendmail/cf/sendmail.mc",
default => "/etc/mail/sendmail.mc", }, default => "/etc/mail/sendmail.mc",
},
content => template("sendmail/sendmail.mc.erb"), content => template("sendmail/sendmail.mc.erb"),
owner => "root", owner => "root",
group => $group, group => $group,

4
ssh/manifests/init.pp
View file

@ -12,10 +12,10 @@ class ssh::known_hosts {
}, },
} }
@@sshkey { "${homename}": @@sshkey { $homename:
ensure => present, ensure => present,
type => rsa, type => rsa,
key => "${sshrsakey}", key => $sshrsakey,
host_aliases => inline_template("<%= homename.split('.')[0] %>"), host_aliases => inline_template("<%= homename.split('.')[0] %>"),
require => File["/etc/ssh/ssh_known_hosts"], require => File["/etc/ssh/ssh_known_hosts"],
} }

10
ssl/manifests/init.pp
View file

@ -77,10 +77,10 @@ define ssl::certificate($cn, $mode, $owner, $group,
exec { "openssl-req-${name}": exec { "openssl-req-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
command => "/bin/sh -c 'umask 077 ; openssl req -x509 -nodes -days ${days} -newkey rsa:${keysize} -subj \"${subject_real}\" -keyout ${keyout_real} -out ${name}'", command => "/bin/sh -c 'umask 077 ; openssl req -x509 -nodes -days ${days} -newkey rsa:${keysize} -subj \"${subject_real}\" -keyout ${keyout_real} -out ${name}'",
creates => [ "${name}", "${keyout_real}" ], creates => [ $name, $keyout_real ],
} }
file { "${name}": file { $name:
ensure => present, ensure => present,
mode => $mode, mode => $mode,
owner => $owner, owner => $owner,
@ -89,7 +89,7 @@ define ssl::certificate($cn, $mode, $owner, $group,
} }
if $keyout { if $keyout {
file { "${keyout}": file { $keyout:
ensure => present, ensure => present,
mode => $keymode, mode => $keymode,
owner => $keyowner, owner => $keyowner,
@ -117,10 +117,10 @@ define ssl::dhparam($mode, $owner, $group, $keysize="1024") {
exec { "openssl-dhparam-${name}": exec { "openssl-dhparam-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
command => "/bin/sh -c 'umask 077 ; openssl dhparam -out ${name} ${keysize}'", command => "/bin/sh -c 'umask 077 ; openssl dhparam -out ${name} ${keysize}'",
creates => "${name}", creates => $name,
} }
file { "${name}": file { $name:
ensure => present, ensure => present,
mode => $mode, mode => $mode,
owner => $owner, owner => $owner,

6
svn/manifests/init.pp
View file

@ -41,13 +41,13 @@ define svn::checkout($source, $ensure="HEAD") {
exec { "svn-co-${name}": exec { "svn-co-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "svn checkout --non-interactive -r ${ensure} ${source} ${name}", command => "svn checkout --non-interactive -r ${ensure} ${source} ${name}",
creates => "${name}", creates => $name,
require => [ Package["subversion"], File["/etc/subversion/servers"], ], require => [ Package["subversion"], File["/etc/subversion/servers"], ],
} }
exec { "svn-up-${name}": exec { "svn-up-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => "${name}", cwd => $name,
command => "svn update --non-interactive -r ${ensure}", command => "svn update --non-interactive -r ${ensure}",
onlyif => $ensure ? { onlyif => $ensure ? {
"HEAD" => "svn status --non-interactive -q -u 2>&1 | egrep '^[[:space:]]+\\*'", "HEAD" => "svn status --non-interactive -q -u 2>&1 | egrep '^[[:space:]]+\\*'",
@ -92,7 +92,7 @@ define svn::export($source, $ensure="HEAD") {
exec { "svn-export-${name}": exec { "svn-export-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "svn export --non-interactive -r ${ensure} ${source} ${name} && svn info --non-interactive -r ${ensure} ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }' > ${name}/.svnrevision", command => "svn export --non-interactive -r ${ensure} ${source} ${name} && svn info --non-interactive -r ${ensure} ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }' > ${name}/.svnrevision",
creates => "${name}", creates => $name,
require => Exec["svn-export-clean-${name}"], require => Exec["svn-export-clean-${name}"],
} }

2
syslog/manifests/init.pp
View file

@ -84,8 +84,8 @@ class syslog::client::syslogd {
if $operatingsystem != "OpenBSD" { if $operatingsystem != "OpenBSD" {
package { "syslogd": package { "syslogd":
name => "sysklogd",
ensure => installed, ensure => installed,
name => "sysklogd",
before => File["/etc/syslog.conf"], before => File["/etc/syslog.conf"],
} }
} }

8
tftp/manifests/init.pp
View file

@ -9,7 +9,7 @@
class tftp::server { class tftp::server {
if $tftp_datadir { if $tftp_datadir {
file { "${tftp_datadir}": file { $tftp_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => root, owner => root,
@ -21,9 +21,9 @@ class tftp::server {
} }
file { "/srv/tftpboot": file { "/srv/tftpboot":
ensure => link, ensure => link,
target => "${tftp_datadir}", target => $tftp_datadir,
seltype => "tftpdir_t", seltype => "tftpdir_t",
require => File["${tftp_datadir}"], require => File[$tftp_datadir],
} }
} else { } else {
file { "/srv/tftpboot": file { "/srv/tftpboot":
@ -65,7 +65,7 @@ class tftp::server {
if $tftp_datadir { if $tftp_datadir {
selinux::manage_fcontext { "${tftp_datadir}(/.*)?": selinux::manage_fcontext { "${tftp_datadir}(/.*)?":
type => "tftpdir_t", type => "tftpdir_t",
before => File["${tftp_datadir}"], before => File[$tftp_datadir],
} }
} }
} }

3
time/manifests/init.pp
View file

@ -36,5 +36,8 @@ class time::zone {
content => "$timezone_set\n", content => "$timezone_set\n",
} }
} }
default: {
fail("time::zone not supported on ${operatingsystem}")
}
} }
} }

8
user/manifests/init.pp
View file

@ -12,8 +12,7 @@ class user::system {
}, },
} }
case $operatingsystem { if $operatingsystem == "ubuntu": {
"ubuntu": {
file { "/sbin/nologin": file { "/sbin/nologin":
ensure => link, ensure => link,
target => "/usr/sbin/nologin", target => "/usr/sbin/nologin",
@ -21,7 +20,6 @@ class user::system {
group => "root", group => "root",
} }
} }
}
User { User {
require => File["/var/empty"], require => File["/var/empty"],
@ -241,7 +239,7 @@ class user::system {
# #
define user::newuser($uid, $gid, $comment, $home, $shell, $groups=undef, $requiregroups=undef) { define user::newuser($uid, $gid, $comment, $home, $shell, $groups=undef, $requiregroups=undef) {
user { "${name}": user { $name:
ensure => present, ensure => present,
uid => $uid, uid => $uid,
gid => $gid, gid => $gid,
@ -268,7 +266,7 @@ define user::newuser($uid, $gid, $comment, $home, $shell, $groups=undef, $requir
command => "/bin/sh -c 'umask 077; mkdir -p ${home} && tar cf - . | tar xf - -C ${home} && chown -R ${uid}:${gid} ${home}'", command => "/bin/sh -c 'umask 077; mkdir -p ${home} && tar cf - . | tar xf - -C ${home} && chown -R ${uid}:${gid} ${home}'",
cwd => "/etc/skel", cwd => "/etc/skel",
path => "/sbin:/usr/sbin:/bin:/usr/bin", path => "/sbin:/usr/sbin:/bin:/usr/bin",
creates => "${home}", creates => $home,
refreshonly => true, refreshonly => true,
} }

18
util/manifests/init.pp
View file

@ -28,14 +28,14 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
exec { "tar-rmdir-${name}": exec { "tar-rmdir-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "rm -fr ${name}", command => "rm -fr ${name}",
before => File["${name}"], before => File[$name],
subscribe => File["${source}"], subscribe => File[$source],
refreshonly => true, refreshonly => true,
} }
} }
} }
file { "${name}": file { $name:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => "root", owner => "root",
@ -65,7 +65,7 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
exec { "tar-extract-${name}": exec { "tar-extract-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
command => $command, command => $command,
require => File["${name}"], require => File[$name],
unless => "test -n \"$(ls -A ${name})\"", unless => "test -n \"$(ls -A ${name})\"",
} }
@ -95,8 +95,8 @@ define util::extract::zip($source, $ensure=present) {
exec { "zip-rmdir-${name}": exec { "zip-rmdir-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "rm -fr ${name}", command => "rm -fr ${name}",
before => File["${name}"], before => File[$name],
subscribe => File["${source}"], subscribe => File[$source],
refreshonly => true, refreshonly => true,
} }
} }
@ -104,7 +104,7 @@ define util::extract::zip($source, $ensure=present) {
$command = "unzip ${source} -d ${name}" $command = "unzip ${source} -d ${name}"
file { "${name}": file { $name:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => root, owner => root,
@ -114,7 +114,7 @@ define util::extract::zip($source, $ensure=present) {
exec { "zip-extract-${name}": exec { "zip-extract-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => $command, command => $command,
require => File["${name}"], require => File[$name],
unless => "test -n \"$(ls -A ${name})\"", unless => "test -n \"$(ls -A ${name})\"",
} }
@ -158,7 +158,7 @@ define util::patch($source, $strip=0) {
exec { "patch-${name}-${source}": exec { "patch-${name}-${source}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => "${name}", cwd => $name,
command => "patch -N -b -t -p${strip} < ${source}", command => "patch -N -b -t -p${strip} < ${source}",
onlyif => "patch --dry-run -N -b -t -p${strip} < ${source}", onlyif => "patch --dry-run -N -b -t -p${strip} < ${source}",
require => Class["util::patch::package"], require => Class["util::patch::package"],

10
vmware/manifests/server.pp
View file

@ -189,9 +189,9 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults")
mount { "/vmfs/volumes/${name}": mount { "/vmfs/volumes/${name}":
ensure => mounted, ensure => mounted,
device => "${device}", device => $device,
fstype => "${fstype}", fstype => $fstype,
options => "${mountopts}", options => $mountopts,
require => File["/vmfs/volumes/${name}"], require => File["/vmfs/volumes/${name}"],
} }
@ -261,14 +261,14 @@ define vmware::server::bridge($description, $device, $ensure = "present") {
vmware_config { "VNET_${vmnet}_NAME": vmware_config { "VNET_${vmnet}_NAME":
ensure => $ensure ? { ensure => $ensure ? {
absent => absent, absent => absent,
present => "${description}", present => $description,
}, },
require => Exec["vmware-config.pl"], require => Exec["vmware-config.pl"],
} }
vmware_config { "VNET_${vmnet}_INTERFACE": vmware_config { "VNET_${vmnet}_INTERFACE":
ensure => $ensure ? { ensure => $ensure ? {
absent => absent, absent => absent,
present => "${device}", present => $device,
}, },
notify => Service["${name}-bridge"], notify => Service["${name}-bridge"],
require => Exec["vmware-config.pl"], require => Exec["vmware-config.pl"],

6
vsroom/manifests/init.pp
View file

@ -44,7 +44,7 @@ class vsroom {
realize(User["vsroom"], Group["vsroom"]) realize(User["vsroom"], Group["vsroom"])
if $vsroom_datadir { if $vsroom_datadir {
file { "${vsroom_datadir}": file { $vsroom_datadir:
ensure => directory, ensure => directory,
mode => 0750, mode => 0750,
owner => "root", owner => "root",
@ -53,8 +53,8 @@ class vsroom {
file { "/var/lib/vsroom": file { "/var/lib/vsroom":
ensure => link, ensure => link,
target => "${vsroom_datadir}", target => $vsroom_datadir,
require => File["${vsroom_datadir}"], require => File[$vsroom_datadir],
} }
} else { } else {
file { "/var/lib/vsroom": file { "/var/lib/vsroom":

6
wiki/manifests/init.pp
View file

@ -171,7 +171,7 @@ class wiki::collab::base {
} }
if $wiki_datadir { if $wiki_datadir {
file { "${wiki_datadir}": file { $wiki_datadir:
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
owner => root, owner => root,
@ -180,8 +180,8 @@ class wiki::collab::base {
file { "/srv/wikis": file { "/srv/wikis":
ensure => link, ensure => link,
target => "${wiki_datadir}", target => $wiki_datadir,
require => File["${wiki_datadir}"], require => File[$wiki_datadir],
} }
} else { } else {
file { "/srv/wikis": file { "/srv/wikis":