Fixing puppet-lint errors.
This commit is contained in:
parent
2f83cb7d4a
commit
34c36045fa
59 changed files with 995 additions and 990 deletions
|
|
@ -84,7 +84,7 @@ class abusehelper {
|
|||
realize(User["abusehel"], Group["abusehel"])
|
||||
|
||||
if $abusehelper_datadir {
|
||||
file { "${abusehelper_datadir}":
|
||||
file { $abusehelper_datadir:
|
||||
ensure => directory,
|
||||
mode => 0750,
|
||||
owner => "root",
|
||||
|
|
@ -94,8 +94,8 @@ class abusehelper {
|
|||
|
||||
file { "/var/lib/ah2":
|
||||
ensure => link,
|
||||
target => "${abusehelper_datadir}",
|
||||
require => File["${abusehelper_datadir}"],
|
||||
target => $abusehelper_datadir,
|
||||
require => File[$abusehelper_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/var/lib/ah2":
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ class alpine {
|
|||
$mail_server = "mail.${domain}"
|
||||
}
|
||||
if ! $mail_domain {
|
||||
$mail_domain = "${domain}"
|
||||
$mail_domain = $domain
|
||||
}
|
||||
|
||||
file { "/usr/bin/pine":
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class amanda::client inherits amanda::common {
|
|||
if $amanda_clientkey {
|
||||
@@ssh_authorized_key { "amrecover@${homename}":
|
||||
ensure => present,
|
||||
key => "${amanda_clientkey}",
|
||||
key => $amanda_clientkey,
|
||||
type => "ssh-rsa",
|
||||
user => "amandabackup",
|
||||
tag => "amandaclient",
|
||||
|
|
@ -75,7 +75,7 @@ class amanda::server inherits amanda::common {
|
|||
if $amanda_serverkey {
|
||||
@@ssh_authorized_key { "amdump@${homename}":
|
||||
ensure => present,
|
||||
key => "${amanda_serverkey}",
|
||||
key => $amanda_serverkey,
|
||||
type => "ssh-rsa",
|
||||
user => "amandabackup",
|
||||
tag => "amandaserver",
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ define apache::debian::site($aliases, $root, $redirect) {
|
|||
file { "/srv/www/http/${site_fqdn}":
|
||||
ensure => link,
|
||||
target => $root,
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/www/http/${site_fqdn}":
|
||||
|
|
@ -112,7 +112,7 @@ define apache::debian::site($aliases, $root, $redirect) {
|
|||
mode => 0755,
|
||||
owner => root,
|
||||
group => root,
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -121,12 +121,12 @@ define apache::debian::site($aliases, $root, $redirect) {
|
|||
mode => 0755,
|
||||
owner => root,
|
||||
group => root,
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
file { "${site_conf}":
|
||||
file { $site_conf:
|
||||
ensure => present,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
@ -135,14 +135,14 @@ define apache::debian::site($aliases, $root, $redirect) {
|
|||
}
|
||||
|
||||
if $redirect {
|
||||
File["${site_conf}"] {
|
||||
File[$site_conf] {
|
||||
content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n",
|
||||
}
|
||||
} else {
|
||||
File["${site_conf}"] {
|
||||
File[$site_conf] {
|
||||
content => template("apache/site.http.conf.erb"),
|
||||
}
|
||||
file { "${site_confdir}":
|
||||
file { $site_confdir:
|
||||
ensure => directory,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
@ -152,7 +152,7 @@ define apache::debian::site($aliases, $root, $redirect) {
|
|||
recurse => true,
|
||||
source => [ "puppet:///files/apache/sites/${site_fqdn}",
|
||||
"puppet:///modules/custom/empty", ],
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
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_confdir = "/etc/apache2/sites-enabled/${site_fqdn}-ssl.d"
|
||||
|
||||
file { "${site_conf}":
|
||||
file { $site_conf:
|
||||
ensure => present,
|
||||
content => template("apache/site.https.conf.erb"),
|
||||
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 { "${site_confdir}":
|
||||
file { $site_confdir:
|
||||
ensure => directory,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
@ -277,7 +277,7 @@ define apache::debian::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
|
|||
recurse => true,
|
||||
source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
|
||||
"puppet:///modules/custom/empty", ],
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
notify => Service["apache2"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class apache::common {
|
|||
}
|
||||
|
||||
if $apache_datadir {
|
||||
file { "${apache_datadir}":
|
||||
file { $apache_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => "root",
|
||||
|
|
@ -31,8 +31,8 @@ class apache::common {
|
|||
|
||||
file { "/srv/www":
|
||||
ensure => link,
|
||||
target => "${apache_datadir}",
|
||||
require => File["${apache_datadir}"],
|
||||
target => $apache_datadir,
|
||||
require => File[$apache_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/www":
|
||||
|
|
@ -55,7 +55,7 @@ class apache::common {
|
|||
if $apache_datadir {
|
||||
selinux::manage_fcontext { "${apache_datadir}(/.*)?":
|
||||
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 {
|
||||
debian,ubuntu: {
|
||||
apache::debian::site { "${name}":
|
||||
apache::debian::site { $name:
|
||||
aliases => $aliases,
|
||||
root => $root,
|
||||
redirect => $redirect,
|
||||
}
|
||||
}
|
||||
centos,fedora: {
|
||||
apache::redhat::site { "${name}":
|
||||
apache::redhat::site { $name:
|
||||
aliases => $aliases,
|
||||
root => $root,
|
||||
redirect => $redirect,
|
||||
|
|
@ -175,8 +175,8 @@ define apache::site($aliases="", $root="", $redirect="") {
|
|||
|
||||
if !$redirect {
|
||||
$site_fqdn = $name ? {
|
||||
"default" => "${homename}",
|
||||
default => "${name}",
|
||||
"default" => $homename,
|
||||
default => $name,
|
||||
}
|
||||
apache::webalizer::site { "http/${site_fqdn}":
|
||||
site_proto => "http",
|
||||
|
|
@ -268,7 +268,7 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
|
|||
case $operatingsystem {
|
||||
debian,ubuntu: {
|
||||
$apache_ssldir = "/etc/ssl"
|
||||
apache::debian::sslsite { "${name}":
|
||||
apache::debian::sslsite { $name:
|
||||
ipaddr => $ipaddr,
|
||||
root => $root,
|
||||
ssl_cert => $ssl_cert,
|
||||
|
|
@ -279,7 +279,7 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
|
|||
}
|
||||
centos,fedora: {
|
||||
$apache_ssldir = "/etc/pki/tls"
|
||||
apache::redhat::sslsite { "${name}":
|
||||
apache::redhat::sslsite { $name:
|
||||
ipaddr => $ipaddr,
|
||||
root => $root,
|
||||
ssl_cert => $ssl_cert,
|
||||
|
|
@ -294,8 +294,8 @@ define apache::sslsite($ipaddr="_default_", $root="", $ssl_cert="", $ssl_key="",
|
|||
}
|
||||
|
||||
$site_fqdn = $name ? {
|
||||
"default" => "${homename}",
|
||||
default => "${name}",
|
||||
"default" => $homename,
|
||||
default => $name,
|
||||
}
|
||||
apache::webalizer::site { "https/${site_fqdn}":
|
||||
site_proto => "https",
|
||||
|
|
@ -335,17 +335,17 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
|
|||
|
||||
case $operatingsystem {
|
||||
debian,ubuntu: {
|
||||
apache::debian::configfile { "${name}":
|
||||
source => "${source}",
|
||||
content => "${content}",
|
||||
apache::debian::configfile { $name:
|
||||
source => $source,
|
||||
content => $content,
|
||||
http => $http,
|
||||
https => $https,
|
||||
}
|
||||
}
|
||||
centos,fedora: {
|
||||
apache::redhat::configfile { "${name}":
|
||||
source => "${source}",
|
||||
content => "${content}",
|
||||
apache::redhat::configfile { $name:
|
||||
source => $source,
|
||||
content => $content,
|
||||
http => $http,
|
||||
https => $https,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
|
|||
file { "/srv/www/http/${site_fqdn}":
|
||||
ensure => link,
|
||||
target => $root,
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/www/http/${site_fqdn}":
|
||||
|
|
@ -65,7 +65,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
|
|||
mode => 0755,
|
||||
owner => root,
|
||||
group => root,
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -74,12 +74,12 @@ define apache::redhat::site($aliases, $root, $redirect) {
|
|||
mode => 0755,
|
||||
owner => root,
|
||||
group => root,
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
file { "${site_conf}":
|
||||
file { $site_conf:
|
||||
ensure => present,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
@ -88,14 +88,14 @@ define apache::redhat::site($aliases, $root, $redirect) {
|
|||
}
|
||||
|
||||
if $redirect {
|
||||
File["${site_conf}"] {
|
||||
File[$site_conf] {
|
||||
content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n",
|
||||
}
|
||||
} else {
|
||||
File["${site_conf}"] {
|
||||
File[$site_conf] {
|
||||
content => template("apache/site.http.conf.erb"),
|
||||
}
|
||||
file { "${site_confdir}":
|
||||
file { $site_confdir:
|
||||
ensure => directory,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
@ -105,7 +105,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
|
|||
recurse => true,
|
||||
source => [ "puppet:///files/apache/sites/${site_fqdn}",
|
||||
"puppet:///modules/custom/empty", ],
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
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_confdir = "/etc/httpd/site.https.d/${site_fqdn}.d"
|
||||
|
||||
file { "${site_conf}":
|
||||
file { $site_conf:
|
||||
ensure => present,
|
||||
content => template("apache/site.https.conf.erb"),
|
||||
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 { "${site_confdir}":
|
||||
file { $site_confdir:
|
||||
ensure => directory,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
@ -278,7 +278,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
|
|||
recurse => true,
|
||||
source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
|
||||
"puppet:///modules/custom/empty", ],
|
||||
before => File["${site_conf}"],
|
||||
before => File[$site_conf],
|
||||
notify => Service["httpsd"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ define apt::package($ensure, $source) {
|
|||
require => File["/var/cache/apt/local-archives"],
|
||||
}
|
||||
|
||||
package { "${name}":
|
||||
package { $name:
|
||||
ensure => $ensure,
|
||||
source => "/var/cache/apt/local-archives/${filename}",
|
||||
provider => dpkg,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
define backuppc::manualclient($ensure = "present", $operatingsystem = "default") {
|
||||
|
||||
@@file { "/etc/BackupPC/pc/${name}.pl":
|
||||
ensure => "${ensure}",
|
||||
ensure => $ensure,
|
||||
source => [ "puppet:///files/backuppc/${name}.pl",
|
||||
"puppet:///files/backuppc/${operatingsystem}.pl",
|
||||
"puppet:///files/backuppc/default.pl",
|
||||
|
|
@ -36,9 +36,9 @@ define backuppc::manualclient($ensure = "present", $operatingsystem = "default")
|
|||
#
|
||||
class backuppc::client {
|
||||
|
||||
backuppc::manualclient { "${homename}":
|
||||
backuppc::manualclient { $homename:
|
||||
ensure => present,
|
||||
operatingsystem => "${operatingsystem}",
|
||||
operatingsystem => $operatingsystem,
|
||||
}
|
||||
|
||||
include rsync
|
||||
|
|
@ -63,7 +63,7 @@ class backuppc::server {
|
|||
}
|
||||
|
||||
if $backuppc_datadir {
|
||||
file { "${backuppc_datadir}":
|
||||
file { $backuppc_datadir:
|
||||
ensure => directory,
|
||||
mode => 0750,
|
||||
owner => "backuppc",
|
||||
|
|
@ -72,10 +72,10 @@ class backuppc::server {
|
|||
}
|
||||
|
||||
file { "/var/lib/BackupPC":
|
||||
ensure => "${backuppc_datadir}",
|
||||
ensure => $backuppc_datadir,
|
||||
force => true,
|
||||
backup => ".orig",
|
||||
require => File["${backuppc_datadir}"],
|
||||
require => File[$backuppc_datadir],
|
||||
before => File["/var/lib/BackupPC/.ssh"],
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class clarified::recorder {
|
|||
}
|
||||
|
||||
if $recorder_datadir {
|
||||
file { "${recorder_datadir}":
|
||||
file { $recorder_datadir:
|
||||
ensure => directory,
|
||||
mode => 0700,
|
||||
owner => root,
|
||||
|
|
@ -58,8 +58,8 @@ class clarified::recorder {
|
|||
|
||||
file { "/var/lib/recorder":
|
||||
ensure => link,
|
||||
target => "${recorder_datadir}",
|
||||
require => File["${recorder_datadir}"],
|
||||
target => $recorder_datadir,
|
||||
require => File[$recorder_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/var/lib/recorder":
|
||||
|
|
|
|||
|
|
@ -50,9 +50,9 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp
|
|||
$test = regsubst($source, '^([^:]+)://.+$', '\1')
|
||||
if "${test}" == "${source}" {
|
||||
$method = "file"
|
||||
$path = "${source}"
|
||||
$path = $source
|
||||
} else {
|
||||
$method = "${test}"
|
||||
$method = $test
|
||||
}
|
||||
|
||||
case $method {
|
||||
|
|
@ -75,33 +75,33 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp
|
|||
cwd => regsubst($name, '(.*)/[^/]+$', '\1'),
|
||||
command => $fetch_cmd,
|
||||
unless => $diff_cmd,
|
||||
before => File["${name}"],
|
||||
before => File[$name],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
file { "${name}":
|
||||
ensure => "${ensure}",
|
||||
source => "${method}" ? {
|
||||
"file" => "${path}",
|
||||
"puppet" => "${source}",
|
||||
file { $name:
|
||||
ensure => $ensure,
|
||||
source => $method ? {
|
||||
"file" => $path,
|
||||
"puppet" => $source,
|
||||
default => undef,
|
||||
},
|
||||
mode => "${mode}" ? {
|
||||
mode => $mode ? {
|
||||
"NONE" => undef,
|
||||
default => "${mode}",
|
||||
default => $mode,
|
||||
},
|
||||
owner => "${owner}" ? {
|
||||
owner => $owner ? {
|
||||
"NONE" => undef,
|
||||
default => "${owner}",
|
||||
default => $owner,
|
||||
},
|
||||
group => "${group}" ? {
|
||||
group => $group ? {
|
||||
"NONE" => undef,
|
||||
default => "${group}",
|
||||
default => $group,
|
||||
},
|
||||
seltype => "${seltype}" ? {
|
||||
seltype => $seltype ? {
|
||||
"NONE" => undef,
|
||||
default => "${seltype}",
|
||||
default => $seltype,
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ class custom::rootpassword {
|
|||
default: {
|
||||
user { "root":
|
||||
ensure => present,
|
||||
password => "${root_password}",
|
||||
password => $root_password,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,8 +111,8 @@ class dns::server {
|
|||
}
|
||||
|
||||
file { "named.conf":
|
||||
path => "${chroot}${config}",
|
||||
ensure => present,
|
||||
path => "${chroot}${config}",
|
||||
mode => 0640,
|
||||
owner => "root",
|
||||
group => $group,
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class ejabberd {
|
|||
realize(User["ejabberd"], Group["ejabberd"])
|
||||
|
||||
if !$ejabberd_hosts {
|
||||
$ejabberd_hosts = [ "${homename}" ]
|
||||
$ejabberd_hosts = [ $homename ]
|
||||
}
|
||||
if !$ejabberd_admin {
|
||||
$ejabberd_admin = []
|
||||
|
|
@ -213,7 +213,7 @@ class ejabberd::backup {
|
|||
$ejabberd_backup_datadir = "/srv/ejabberd-backup"
|
||||
}
|
||||
|
||||
file { "${ejabberd_backup_datadir}":
|
||||
file { $ejabberd_backup_datadir:
|
||||
ensure => directory,
|
||||
mode => 0700,
|
||||
owner => root,
|
||||
|
|
@ -234,7 +234,7 @@ class ejabberd::backup {
|
|||
user => "root",
|
||||
minute => 15,
|
||||
hour => 21,
|
||||
require => File[ "${ejabberd_backup_datadir}",
|
||||
require => File[ $ejabberd_backup_datadir,
|
||||
"/usr/local/sbin/ejabberd-backup" ],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class git::server {
|
|||
include git::client
|
||||
|
||||
if $git_datadir {
|
||||
file { "${git_datadir}":
|
||||
file { $git_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
|
|
@ -34,8 +34,8 @@ class git::server {
|
|||
}
|
||||
file { "/srv/git":
|
||||
ensure => link,
|
||||
target => "${git_datadir}",
|
||||
require => File["${git_datadir}"],
|
||||
target => $git_datadir,
|
||||
require => File[$git_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/git":
|
||||
|
|
@ -55,7 +55,7 @@ class git::server {
|
|||
if $git_datadir {
|
||||
selinux::manage_fcontext { "${git_datadir}(/.*)?":
|
||||
type => "httpd_sys_content_t",
|
||||
before => File["${git_datadir}"],
|
||||
before => File[$git_datadir],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class hastymail {
|
|||
ensure => directory,
|
||||
mode => 0750,
|
||||
owner => "root",
|
||||
group => "${apache::sslserver::group}",
|
||||
group => $apache::sslserver::group,
|
||||
}
|
||||
file { "/etc/hastymail2/hastymail2.conf":
|
||||
ensure => present,
|
||||
|
|
@ -36,7 +36,7 @@ class hastymail {
|
|||
"puppet:///files/mail/hastymail2.conf", ],
|
||||
mode => 0640,
|
||||
owner => "root",
|
||||
group => "${apache::sslserver::group}",
|
||||
group => $apache::sslserver::group,
|
||||
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":
|
||||
|
|
@ -50,7 +50,7 @@ class hastymail {
|
|||
ensure => present,
|
||||
mode => 0640,
|
||||
owner => "root",
|
||||
group => "${apache::sslserver::group}",
|
||||
group => $apache::sslserver::group,
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ define inetd::service($ensure = present) {
|
|||
|
||||
case $operatingsystem {
|
||||
centos,fedora,ubuntu,debian: {
|
||||
service { "${name}":
|
||||
service { $name:
|
||||
enable => $ensure ? {
|
||||
present => true,
|
||||
absent => false,
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ define irc::network($desc, $servername, $serverdesc,
|
|||
}
|
||||
|
||||
ssl::certificate { "/var/lib/ratbox/${name}/ircd.pem":
|
||||
cn => "${servername}",
|
||||
cn => $servername,
|
||||
mode => 0600,
|
||||
owner => "irc",
|
||||
group => "irc",
|
||||
|
|
|
|||
|
|
@ -191,12 +191,12 @@ define kerberos::keytab($principals = [], $ensure = present, $owner = "root", $g
|
|||
}
|
||||
}
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => $ensure,
|
||||
content => template("kerberos/keytab.erb"),
|
||||
mode => "${mode}",
|
||||
owner => "${owner}",
|
||||
group => "${real_group}",
|
||||
mode => $mode,
|
||||
owner => $owner,
|
||||
group => $real_group,
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -273,8 +273,8 @@ class ldap::client::ruby {
|
|||
}
|
||||
|
||||
package { "ruby-ldap":
|
||||
name => $pkgname,
|
||||
ensure => installed,
|
||||
name => $pkgname,
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -346,8 +346,8 @@ class ldap::server {
|
|||
}
|
||||
|
||||
package { "openldap-server":
|
||||
name => $package_name,
|
||||
ensure => installed,
|
||||
name => $package_name,
|
||||
}
|
||||
|
||||
file { "${ssl::certs}/slapd.crt":
|
||||
|
|
@ -373,8 +373,8 @@ class ldap::server {
|
|||
}
|
||||
|
||||
file { "slapd.conf":
|
||||
path => "${config}/slapd.conf",
|
||||
ensure => present,
|
||||
path => "${config}/slapd.conf",
|
||||
content => template("ldap/slapd.conf.erb"),
|
||||
mode => 0640,
|
||||
owner => "root",
|
||||
|
|
@ -418,7 +418,7 @@ class ldap::server {
|
|||
}
|
||||
|
||||
if $ldap_datadir {
|
||||
file { "${ldap_datadir}":
|
||||
file { $ldap_datadir:
|
||||
ensure => directory,
|
||||
mode => 0700,
|
||||
owner => $user,
|
||||
|
|
@ -427,8 +427,8 @@ class ldap::server {
|
|||
}
|
||||
file { "/srv/ldap":
|
||||
ensure => link,
|
||||
target => "${ldap_datadir}",
|
||||
require => File["${ldap_datadir}"],
|
||||
target => $ldap_datadir,
|
||||
require => File[$ldap_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/ldap":
|
||||
|
|
@ -587,8 +587,8 @@ define ldap::server::schema($idx = 50) {
|
|||
include ldap::server
|
||||
|
||||
file { "${name}.schema":
|
||||
path => "${ldap::server::config}/schema/${idx}-${name}.schema",
|
||||
ensure => present,
|
||||
path => "${ldap::server::config}/schema/${idx}-${name}.schema",
|
||||
source => [ "puppet:///files/ldap/${name}.schema",
|
||||
"puppet:///modules/ldap/${name}.schema", ],
|
||||
mode => 0644,
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ define mercurial::clone($source, $ensure="tip") {
|
|||
exec { "hg-clone-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "hg -y clone -r ${ensure} ${source} ${name}",
|
||||
creates => "${name}",
|
||||
creates => $name,
|
||||
require => Package["mercurial"],
|
||||
}
|
||||
|
||||
exec { "hg-pull-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
cwd => "${name}",
|
||||
cwd => $name,
|
||||
command => "hg -y pull -u -r ${ensure}",
|
||||
onlyif => $ensure ? {
|
||||
"tip" => "hg -y in",
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ class munin::node {
|
|||
}
|
||||
|
||||
@@file { "/etc/munin/nodes.d/${homename}.conf":
|
||||
content => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n",
|
||||
ensure => present,
|
||||
content => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n",
|
||||
tag => "munin",
|
||||
notify => Exec["generate-munin-conf"],
|
||||
}
|
||||
|
|
@ -82,8 +82,8 @@ class munin::node {
|
|||
define munin::snmpnode($snmp_community="public", $snmp_version="2") {
|
||||
|
||||
file { "/etc/munin/plugin-conf.d/snmp_${name}":
|
||||
content => "[snmp_${name}_*]\nenv.community ${snmp_community}\nenv.version ${snmp_version}\n",
|
||||
ensure => present,
|
||||
content => "[snmp_${name}_*]\nenv.community ${snmp_community}\nenv.version ${snmp_version}\n",
|
||||
owner => root,
|
||||
group => $operatingsystem ? {
|
||||
OpenBSD => wheel,
|
||||
|
|
@ -94,8 +94,8 @@ define munin::snmpnode($snmp_community="public", $snmp_version="2") {
|
|||
}
|
||||
|
||||
@@file { "/etc/munin/nodes.d/${name}.conf":
|
||||
content => "[${name}]\n address ${ipaddress}\n use_node_name no\n",
|
||||
ensure => present,
|
||||
content => "[${name}]\n address ${ipaddress}\n use_node_name no\n",
|
||||
tag => "munin",
|
||||
notify => Exec["generate-munin-conf"],
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ class munin::server {
|
|||
}
|
||||
|
||||
if $munin_datadir {
|
||||
file { "${munin_datadir}":
|
||||
file { $munin_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => munin,
|
||||
|
|
@ -220,15 +220,15 @@ class munin::server {
|
|||
}
|
||||
|
||||
file { "/var/lib/munin":
|
||||
ensure => "${munin_datadir}",
|
||||
ensure => $munin_datadir,
|
||||
force => true,
|
||||
backup => ".orig",
|
||||
require => File["${munin_datadir}"],
|
||||
require => File[$munin_datadir],
|
||||
}
|
||||
}
|
||||
|
||||
if $munin_htmldir {
|
||||
file { "${munin_htmldir}":
|
||||
file { $munin_htmldir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => munin,
|
||||
|
|
@ -248,11 +248,11 @@ class munin::server {
|
|||
}
|
||||
|
||||
file { "/var/www/html/munin":
|
||||
ensure => "${munin_htmldir}",
|
||||
ensure => $munin_htmldir,
|
||||
force => true,
|
||||
backup => ".orig",
|
||||
seltype => "munin_var_lib_t",
|
||||
require => File["${munin_htmldir}"],
|
||||
require => File[$munin_htmldir],
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ class mutt {
|
|||
$mail_server = "mail.${domain}"
|
||||
}
|
||||
if ! $mail_domain {
|
||||
$mail_domain = "${domain}"
|
||||
$mail_domain = $domain
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
|
|
@ -26,8 +26,8 @@ class mutt {
|
|||
}
|
||||
|
||||
file { "Muttrc.local":
|
||||
name => "${muttconfdir}/Muttrc.local",
|
||||
ensure => present,
|
||||
name => "${muttconfdir}/Muttrc.local",
|
||||
content => template("mutt/Muttrc.local.erb"),
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class mysql::server {
|
|||
}
|
||||
|
||||
if $mysql_datadir {
|
||||
file { "${mysql_datadir}":
|
||||
file { $mysql_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => mysql,
|
||||
|
|
@ -34,9 +34,9 @@ class mysql::server {
|
|||
}
|
||||
file { "/srv/mysql":
|
||||
ensure => link,
|
||||
target => "${mysql_datadir}",
|
||||
target => $mysql_datadir,
|
||||
seltype => "mysqld_db_t",
|
||||
require => File["${mysql_datadir}"],
|
||||
require => File[$mysql_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/mysql":
|
||||
|
|
@ -57,7 +57,7 @@ class mysql::server {
|
|||
if $mysql_datadir {
|
||||
selinux::manage_fcontext { "${mysql_datadir}(/.*)?":
|
||||
type => "mysqld_db_t",
|
||||
before => File["${mysql_datadir}"],
|
||||
before => File[$mysql_datadir],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,8 @@ class mythtv::backend {
|
|||
}
|
||||
|
||||
file { "/root/.mythtv":
|
||||
ensure => "/etc/mythtv",
|
||||
ensure => link,
|
||||
target => "/etc/mythtv",
|
||||
force => true,
|
||||
require => Package["mythtv-backend"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ define network::route($gateway = "", $device, $ipv6gateway = "") {
|
|||
file { "/etc/mygate":
|
||||
ensure => present,
|
||||
content => template("network/mygate.erb"),
|
||||
mode => 644,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
group => wheel,
|
||||
notify => Exec["restart-network"],
|
||||
|
|
@ -335,8 +335,8 @@ define network::carp($password, $ipaddr, $netmask, $options = []) {
|
|||
case $operatingsystem {
|
||||
openbsd: {
|
||||
network::interface { "carp${name}":
|
||||
ipaddr => "${ipaddr}",
|
||||
netmask => "${netmask}",
|
||||
ipaddr => $ipaddr,
|
||||
netmask => $netmask,
|
||||
options => [ "vhid ${name}", "pass ${password}", $options ],
|
||||
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:
|
||||
options => [ "MASTER=${name}", "SLAVE=yes", ],
|
||||
require => File["/etc/modprobe.d/${name}.conf"],
|
||||
before => Network::Interface["${name}"],
|
||||
before => Network::Interface[$name],
|
||||
}
|
||||
network::interface { $name:
|
||||
ipaddr => "${ipaddr}",
|
||||
netmask => "${netmask}",
|
||||
ipaddr => $ipaddr,
|
||||
netmask => $netmask,
|
||||
}
|
||||
}
|
||||
default: {
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ class nginx {
|
|||
}
|
||||
|
||||
service { "nginx":
|
||||
enable => true,
|
||||
ensure => running,
|
||||
enable => true,
|
||||
require => Package["nginx"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ class puppet::client {
|
|||
}
|
||||
ubuntu,debian: {
|
||||
package { "libaugeas-ruby":
|
||||
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
|
||||
ensure => installed,
|
||||
name => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
|
||||
before => Service["puppet"],
|
||||
}
|
||||
}
|
||||
|
|
@ -259,7 +259,7 @@ class puppet::server::common inherits puppet::client {
|
|||
}
|
||||
|
||||
if $puppet_datadir {
|
||||
file { "${puppet_datadir}":
|
||||
file { $puppet_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
|
|
@ -272,9 +272,9 @@ class puppet::server::common inherits puppet::client {
|
|||
}
|
||||
file { "/srv/puppet":
|
||||
ensure => link,
|
||||
target => "${puppet_datadir}",
|
||||
target => $puppet_datadir,
|
||||
seltype => "var_lib_t",
|
||||
require => File["${puppet_datadir}"],
|
||||
require => File[$puppet_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/puppet":
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ define python::setup::install($python="python") {
|
|||
|
||||
exec { "python-setup-install-${name}":
|
||||
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
||||
cwd => "${name}",
|
||||
cwd => $name,
|
||||
command => "${python} setup.py install",
|
||||
creates => "${name}/build",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,8 +43,9 @@ class saslauthd::server {
|
|||
define saslauthd::service() {
|
||||
|
||||
case $architecture {
|
||||
i386: { $libdir = "/usr/lib/sasl2" }
|
||||
x86_64: { $libdir = "/usr/lib64/sasl2" }
|
||||
"i386": { $libdir = "/usr/lib/sasl2" }
|
||||
"x86_64": { $libdir = "/usr/lib64/sasl2" }
|
||||
default: { fail("Unknown architecture ${architecture}")
|
||||
}
|
||||
|
||||
file { "${libdir}/${name}.conf":
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ class sendmail::common {
|
|||
|
||||
if $operatingsystem != "OpenBSD" {
|
||||
package { "sendmail":
|
||||
name => [ "sendmail", "sendmail-cf", ],
|
||||
ensure => installed,
|
||||
name => [ "sendmail", "sendmail-cf", ],
|
||||
}
|
||||
service { "sendmail":
|
||||
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",
|
||||
default => "/etc/mail/sendmail.mc", },
|
||||
default => "/etc/mail/sendmail.mc",
|
||||
},
|
||||
content => template("sendmail/sendmail.mc.erb"),
|
||||
owner => "root",
|
||||
group => $group,
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ class ssh::known_hosts {
|
|||
},
|
||||
}
|
||||
|
||||
@@sshkey { "${homename}":
|
||||
@@sshkey { $homename:
|
||||
ensure => present,
|
||||
type => rsa,
|
||||
key => "${sshrsakey}",
|
||||
key => $sshrsakey,
|
||||
host_aliases => inline_template("<%= homename.split('.')[0] %>"),
|
||||
require => File["/etc/ssh/ssh_known_hosts"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,10 +77,10 @@ define ssl::certificate($cn, $mode, $owner, $group,
|
|||
exec { "openssl-req-${name}":
|
||||
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}'",
|
||||
creates => [ "${name}", "${keyout_real}" ],
|
||||
creates => [ $name, $keyout_real ],
|
||||
}
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => present,
|
||||
mode => $mode,
|
||||
owner => $owner,
|
||||
|
|
@ -89,7 +89,7 @@ define ssl::certificate($cn, $mode, $owner, $group,
|
|||
}
|
||||
|
||||
if $keyout {
|
||||
file { "${keyout}":
|
||||
file { $keyout:
|
||||
ensure => present,
|
||||
mode => $keymode,
|
||||
owner => $keyowner,
|
||||
|
|
@ -117,10 +117,10 @@ define ssl::dhparam($mode, $owner, $group, $keysize="1024") {
|
|||
exec { "openssl-dhparam-${name}":
|
||||
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
||||
command => "/bin/sh -c 'umask 077 ; openssl dhparam -out ${name} ${keysize}'",
|
||||
creates => "${name}",
|
||||
creates => $name,
|
||||
}
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => present,
|
||||
mode => $mode,
|
||||
owner => $owner,
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ define svn::checkout($source, $ensure="HEAD") {
|
|||
exec { "svn-co-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "svn checkout --non-interactive -r ${ensure} ${source} ${name}",
|
||||
creates => "${name}",
|
||||
creates => $name,
|
||||
require => [ Package["subversion"], File["/etc/subversion/servers"], ],
|
||||
}
|
||||
|
||||
exec { "svn-up-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
cwd => "${name}",
|
||||
cwd => $name,
|
||||
command => "svn update --non-interactive -r ${ensure}",
|
||||
onlyif => $ensure ? {
|
||||
"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}":
|
||||
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",
|
||||
creates => "${name}",
|
||||
creates => $name,
|
||||
require => Exec["svn-export-clean-${name}"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ class syslog::client::syslogd {
|
|||
|
||||
if $operatingsystem != "OpenBSD" {
|
||||
package { "syslogd":
|
||||
name => "sysklogd",
|
||||
ensure => installed,
|
||||
name => "sysklogd",
|
||||
before => File["/etc/syslog.conf"],
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
class tftp::server {
|
||||
|
||||
if $tftp_datadir {
|
||||
file { "${tftp_datadir}":
|
||||
file { $tftp_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
|
|
@ -21,9 +21,9 @@ class tftp::server {
|
|||
}
|
||||
file { "/srv/tftpboot":
|
||||
ensure => link,
|
||||
target => "${tftp_datadir}",
|
||||
target => $tftp_datadir,
|
||||
seltype => "tftpdir_t",
|
||||
require => File["${tftp_datadir}"],
|
||||
require => File[$tftp_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/tftpboot":
|
||||
|
|
@ -65,7 +65,7 @@ class tftp::server {
|
|||
if $tftp_datadir {
|
||||
selinux::manage_fcontext { "${tftp_datadir}(/.*)?":
|
||||
type => "tftpdir_t",
|
||||
before => File["${tftp_datadir}"],
|
||||
before => File[$tftp_datadir],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,5 +36,8 @@ class time::zone {
|
|||
content => "$timezone_set\n",
|
||||
}
|
||||
}
|
||||
default: {
|
||||
fail("time::zone not supported on ${operatingsystem}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@ class user::system {
|
|||
},
|
||||
}
|
||||
|
||||
case $operatingsystem {
|
||||
"ubuntu": {
|
||||
if $operatingsystem == "ubuntu": {
|
||||
file { "/sbin/nologin":
|
||||
ensure => link,
|
||||
target => "/usr/sbin/nologin",
|
||||
|
|
@ -21,7 +20,6 @@ class user::system {
|
|||
group => "root",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
User {
|
||||
require => File["/var/empty"],
|
||||
|
|
@ -241,7 +239,7 @@ class user::system {
|
|||
#
|
||||
define user::newuser($uid, $gid, $comment, $home, $shell, $groups=undef, $requiregroups=undef) {
|
||||
|
||||
user { "${name}":
|
||||
user { $name:
|
||||
ensure => present,
|
||||
uid => $uid,
|
||||
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}'",
|
||||
cwd => "/etc/skel",
|
||||
path => "/sbin:/usr/sbin:/bin:/usr/bin",
|
||||
creates => "${home}",
|
||||
creates => $home,
|
||||
refreshonly => true,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
|
|||
exec { "tar-rmdir-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "rm -fr ${name}",
|
||||
before => File["${name}"],
|
||||
subscribe => File["${source}"],
|
||||
before => File[$name],
|
||||
subscribe => File[$source],
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => "root",
|
||||
|
|
@ -65,7 +65,7 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
|
|||
exec { "tar-extract-${name}":
|
||||
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
||||
command => $command,
|
||||
require => File["${name}"],
|
||||
require => File[$name],
|
||||
unless => "test -n \"$(ls -A ${name})\"",
|
||||
}
|
||||
|
||||
|
|
@ -95,8 +95,8 @@ define util::extract::zip($source, $ensure=present) {
|
|||
exec { "zip-rmdir-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "rm -fr ${name}",
|
||||
before => File["${name}"],
|
||||
subscribe => File["${source}"],
|
||||
before => File[$name],
|
||||
subscribe => File[$source],
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
|
|
@ -104,7 +104,7 @@ define util::extract::zip($source, $ensure=present) {
|
|||
|
||||
$command = "unzip ${source} -d ${name}"
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
|
|
@ -114,7 +114,7 @@ define util::extract::zip($source, $ensure=present) {
|
|||
exec { "zip-extract-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => $command,
|
||||
require => File["${name}"],
|
||||
require => File[$name],
|
||||
unless => "test -n \"$(ls -A ${name})\"",
|
||||
}
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ define util::patch($source, $strip=0) {
|
|||
|
||||
exec { "patch-${name}-${source}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
cwd => "${name}",
|
||||
cwd => $name,
|
||||
command => "patch -N -b -t -p${strip} < ${source}",
|
||||
onlyif => "patch --dry-run -N -b -t -p${strip} < ${source}",
|
||||
require => Class["util::patch::package"],
|
||||
|
|
|
|||
|
|
@ -189,9 +189,9 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults")
|
|||
|
||||
mount { "/vmfs/volumes/${name}":
|
||||
ensure => mounted,
|
||||
device => "${device}",
|
||||
fstype => "${fstype}",
|
||||
options => "${mountopts}",
|
||||
device => $device,
|
||||
fstype => $fstype,
|
||||
options => $mountopts,
|
||||
require => File["/vmfs/volumes/${name}"],
|
||||
}
|
||||
|
||||
|
|
@ -261,14 +261,14 @@ define vmware::server::bridge($description, $device, $ensure = "present") {
|
|||
vmware_config { "VNET_${vmnet}_NAME":
|
||||
ensure => $ensure ? {
|
||||
absent => absent,
|
||||
present => "${description}",
|
||||
present => $description,
|
||||
},
|
||||
require => Exec["vmware-config.pl"],
|
||||
}
|
||||
vmware_config { "VNET_${vmnet}_INTERFACE":
|
||||
ensure => $ensure ? {
|
||||
absent => absent,
|
||||
present => "${device}",
|
||||
present => $device,
|
||||
},
|
||||
notify => Service["${name}-bridge"],
|
||||
require => Exec["vmware-config.pl"],
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class vsroom {
|
|||
realize(User["vsroom"], Group["vsroom"])
|
||||
|
||||
if $vsroom_datadir {
|
||||
file { "${vsroom_datadir}":
|
||||
file { $vsroom_datadir:
|
||||
ensure => directory,
|
||||
mode => 0750,
|
||||
owner => "root",
|
||||
|
|
@ -53,8 +53,8 @@ class vsroom {
|
|||
|
||||
file { "/var/lib/vsroom":
|
||||
ensure => link,
|
||||
target => "${vsroom_datadir}",
|
||||
require => File["${vsroom_datadir}"],
|
||||
target => $vsroom_datadir,
|
||||
require => File[$vsroom_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/var/lib/vsroom":
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ class wiki::collab::base {
|
|||
}
|
||||
|
||||
if $wiki_datadir {
|
||||
file { "${wiki_datadir}":
|
||||
file { $wiki_datadir:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
|
|
@ -180,8 +180,8 @@ class wiki::collab::base {
|
|||
|
||||
file { "/srv/wikis":
|
||||
ensure => link,
|
||||
target => "${wiki_datadir}",
|
||||
require => File["${wiki_datadir}"],
|
||||
target => $wiki_datadir,
|
||||
require => File[$wiki_datadir],
|
||||
}
|
||||
} else {
|
||||
file { "/srv/wikis":
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue