diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp index c290af9..aaaa585 100644 --- a/abusehelper/manifests/init.pp +++ b/abusehelper/manifests/init.pp @@ -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": diff --git a/alpine/manifests/init.pp b/alpine/manifests/init.pp index ddcc827..a4fe51c 100644 --- a/alpine/manifests/init.pp +++ b/alpine/manifests/init.pp @@ -9,15 +9,15 @@ class alpine { $mail_server = "mail.${domain}" } if ! $mail_domain { - $mail_domain = "${domain}" + $mail_domain = $domain } - + file { "/usr/bin/pine": ensure => link, target => "/usr/bin/alpine", require => Package["alpine"], } - + file { "/etc/pine.conf.fixed": ensure => present, content => template("alpine/pine.conf.fixed.erb"), @@ -26,5 +26,5 @@ class alpine { group => root, require => Package["alpine"], } - + } diff --git a/amanda/manifests/init.pp b/amanda/manifests/init.pp index 0485491..fb21914 100644 --- a/amanda/manifests/init.pp +++ b/amanda/manifests/init.pp @@ -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", diff --git a/apache/manifests/debian.pp b/apache/manifests/debian.pp index 02b40a3..2a57560 100644 --- a/apache/manifests/debian.pp +++ b/apache/manifests/debian.pp @@ -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 => "\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n\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"], } diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp index bd96f5b..e127da4 100644 --- a/apache/manifests/init.pp +++ b/apache/manifests/init.pp @@ -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], } } } @@ -70,11 +70,11 @@ class apache::common { } file { "/usr/local/sbin/www-logrotate.sh": - ensure => present, - source => "puppet:///modules/apache/www-logrotate.sh", - mode => 0755, - owner => root, - group => root, + ensure => present, + source => "puppet:///modules/apache/www-logrotate.sh", + mode => 0755, + owner => root, + group => root, seluser => "system_u", selrole => "object_r", seltype => "httpd_rotatelogs_exec_t", @@ -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, } @@ -418,7 +418,7 @@ class apache::mod::fcgid { ubuntu => "libapache2-mod-fcgid", default => "mod_fcgid", }, - ensure => installed, + ensure => installed, require => Package["httpd"], } @@ -485,7 +485,7 @@ class apache::mod::perl { ubuntu => "libapache2-mod-perl2", default => "mod_perl", }, - ensure => installed, + ensure => installed, require => Package["httpd"], } @@ -518,7 +518,7 @@ class apache::mod::php { ubuntu => "libapache2-mod-php5", default => "php", }, - ensure => installed, + ensure => installed, require => Package["httpd"], } @@ -608,7 +608,7 @@ class apache::mod::python { ubuntu => "libapache2-mod-python", default => "mod_python", }, - ensure => installed, + ensure => installed, require => Package["httpd"], } diff --git a/apache/manifests/redhat.pp b/apache/manifests/redhat.pp index d476e62..5621ee3 100644 --- a/apache/manifests/redhat.pp +++ b/apache/manifests/redhat.pp @@ -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 => "\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n\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"], } @@ -289,7 +289,7 @@ define apache::redhat::configfile($source, $content, $http, $https) { if defined(Service["httpd"]) { file { "/etc/httpd/conf.http.d/${name}": - ensure => $http ? { + ensure => $http ? { true => present, default => absent, }, @@ -322,7 +322,7 @@ define apache::redhat::configfile($source, $content, $http, $https) { if defined(Service["httpsd"]) { file { "/etc/httpd/conf.https.d/${name}": - ensure => $https ? { + ensure => $https ? { true => present, default => absent, }, diff --git a/apcupsd/manifests/init.pp b/apcupsd/manifests/init.pp index e6bfaee..8e94798 100644 --- a/apcupsd/manifests/init.pp +++ b/apcupsd/manifests/init.pp @@ -4,13 +4,13 @@ class apcupsd { package { "apcupsd": - ensure => installed, + ensure => installed, } service { "apcupsd": - ensure => running, - enable => true, - require => Package["apcupsd"], + ensure => running, + enable => true, + require => Package["apcupsd"], } file { "/etc/apcupsd/apcupsd.conf": diff --git a/apt/manifests/init.pp b/apt/manifests/init.pp index 69ff71f..4db2eee 100644 --- a/apt/manifests/init.pp +++ b/apt/manifests/init.pp @@ -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, diff --git a/autofs/manifests/init.pp b/autofs/manifests/init.pp index 7fd8fbc..07a2d11 100644 --- a/autofs/manifests/init.pp +++ b/autofs/manifests/init.pp @@ -2,26 +2,26 @@ class autofs { package { "autofs": - ensure => installed, + ensure => installed, } service { "autofs": - ensure => running, - enable => true, - hasstatus => true, - require => Package["autofs"], + ensure => running, + enable => true, + hasstatus => true, + require => Package["autofs"], } file { "/etc/auto.master": - ensure => present, - source => [ "puppet:///files/autofs/auto.master.${fqdn}", - "puppet:///files/autofs/auto.master", - "puppet:///modules/autofs/auto.master", ], - mode => 0644, - owner => root, - group => root, - require => Package["autofs"], - notify => Service["autofs"], + ensure => present, + source => [ "puppet:///files/autofs/auto.master.${fqdn}", + "puppet:///files/autofs/auto.master", + "puppet:///modules/autofs/auto.master", ], + mode => 0644, + owner => root, + group => root, + require => Package["autofs"], + notify => Service["autofs"], } } diff --git a/avahi/manifests/init.pp b/avahi/manifests/init.pp index 4bc6400..4bcf48b 100644 --- a/avahi/manifests/init.pp +++ b/avahi/manifests/init.pp @@ -41,7 +41,7 @@ class avahi::daemon { }, require => Package["avahi"], } - + } @@ -84,7 +84,7 @@ class avahi::disabled { define avahi::service($port = "AUTO", $description = "%h", $ensure = "present", $txt = []) { $filename = regsubst($name, '^_([^.]+)\._.*', '\1.service') - + if $port == "AUTO" { $realport = avahi_service_port($name) } else { diff --git a/backuppc/manifests/init.pp b/backuppc/manifests/init.pp index e8a3f47..66822a6 100644 --- a/backuppc/manifests/init.pp +++ b/backuppc/manifests/init.pp @@ -17,17 +17,17 @@ define backuppc::manualclient($ensure = "present", $operatingsystem = "default") { @@file { "/etc/BackupPC/pc/${name}.pl": - ensure => "${ensure}", - source => [ "puppet:///files/backuppc/${name}.pl", - "puppet:///files/backuppc/${operatingsystem}.pl", - "puppet:///files/backuppc/default.pl", - "puppet:///modules/backuppc/default.pl", ], - mode => 0640, - owner => root, - group => backuppc, - tag => "backuppc", - require => File["/etc/BackupPC/pc"], - notify => Exec["generate-backuppc-hosts"], + ensure => $ensure, + source => [ "puppet:///files/backuppc/${name}.pl", + "puppet:///files/backuppc/${operatingsystem}.pl", + "puppet:///files/backuppc/default.pl", + "puppet:///modules/backuppc/default.pl", ], + mode => 0640, + owner => root, + group => backuppc, + tag => "backuppc", + require => File["/etc/BackupPC/pc"], + notify => Exec["generate-backuppc-hosts"], } } @@ -36,9 +36,9 @@ define backuppc::manualclient($ensure = "present", $operatingsystem = "default") # class backuppc::client { - backuppc::manualclient { "${homename}": - ensure => present, - operatingsystem => "${operatingsystem}", + backuppc::manualclient { $homename: + ensure => present, + operatingsystem => $operatingsystem, } include rsync @@ -57,13 +57,13 @@ class backuppc::server { realize(User["backuppc"], Group["backuppc"]) package { "BackupPC": - ensure => installed, + ensure => installed, require => [ User["backuppc"], Group["backuppc"], ], } 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"], } } @@ -128,11 +128,11 @@ class backuppc::server { } file { "/etc/BackupPC/config.pl": - ensure => present, - source => "puppet:///files/backuppc/config.pl", - mode => 0440, - owner => "backuppc", - group => "backuppc", + ensure => present, + source => "puppet:///files/backuppc/config.pl", + mode => 0440, + owner => "backuppc", + group => "backuppc", seltype => $operatingsystem ? { "centos" => $operatingsystemrelease ? { /^5/ => "httpd_sys_script_rw_t", @@ -140,17 +140,17 @@ class backuppc::server { }, default => "httpd_sys_rw_content_t", }, - require => Package["BackupPC"], - notify => Service["backuppc"], + require => Package["BackupPC"], + notify => Service["backuppc"], } file { "/etc/BackupPC/hosts.in": - ensure => present, - source => [ "puppet:///files/backuppc/hosts.in", - "puppet:///modules/backuppc/hosts.in", ], - mode => 0644, - owner => "root", - group => "backuppc", + ensure => present, + source => [ "puppet:///files/backuppc/hosts.in", + "puppet:///modules/backuppc/hosts.in", ], + mode => 0644, + owner => "root", + group => "backuppc", seltype => $operatingsystem ? { "centos" => $operatingsystemrelease ? { /^5/ => "httpd_sys_script_rw_t", @@ -158,18 +158,18 @@ class backuppc::server { }, default => "httpd_sys_rw_content_t", }, - require => Package["BackupPC"], - notify => Exec["generate-backuppc-hosts"], + require => Package["BackupPC"], + notify => Exec["generate-backuppc-hosts"], } file { "/etc/BackupPC/pc": - ensure => directory, - purge => true, - force => true, - recurse => true, - mode => 0640, - owner => "root", - group => "backuppc", + ensure => directory, + purge => true, + force => true, + recurse => true, + mode => 0640, + owner => "root", + group => "backuppc", seltype => $operatingsystem ? { "centos" => $operatingsystemrelease ? { /^5/ => "httpd_sys_script_rw_t", @@ -177,17 +177,17 @@ class backuppc::server { }, default => "httpd_sys_rw_content_t", }, - source => "puppet:///modules/custom/empty", - require => Package["BackupPC"], - notify => Exec["generate-backuppc-hosts"], + source => "puppet:///modules/custom/empty", + require => Package["BackupPC"], + notify => Exec["generate-backuppc-hosts"], } exec { "generate-backuppc-hosts": - command => "/bin/sh -c '(cat /etc/BackupPC/hosts.in ; find /etc/BackupPC/pc -name \\*.pl -exec basename {} .pl \\; | sed -e \"s/\$/ 0 adm/\") > /etc/BackupPC/hosts'", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - refreshonly => true, - require => File["/etc/BackupPC/hosts.in"], - notify => Service["backuppc"], + command => "/bin/sh -c '(cat /etc/BackupPC/hosts.in ; find /etc/BackupPC/pc -name \\*.pl -exec basename {} .pl \\; | sed -e \"s/\$/ 0 adm/\") > /etc/BackupPC/hosts'", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + refreshonly => true, + require => File["/etc/BackupPC/hosts.in"], + notify => Service["backuppc"], } File <<| tag == "backuppc" |>> { @@ -201,9 +201,9 @@ class backuppc::server { } service { "backuppc": - ensure => running, - enable => true, - require => Package["BackupPC"], + ensure => running, + enable => true, + require => Package["BackupPC"], } file { "/var/lib/BackupPC/.ssh": diff --git a/clarified/manifests/init.pp b/clarified/manifests/init.pp index fe1c3f2..da32e3c 100644 --- a/clarified/manifests/init.pp +++ b/clarified/manifests/init.pp @@ -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": diff --git a/cups/manifests/init.pp b/cups/manifests/init.pp index c2b1dc3..52ab339 100644 --- a/cups/manifests/init.pp +++ b/cups/manifests/init.pp @@ -4,23 +4,23 @@ class cups::client { package { "cups": - ensure => installed, + ensure => installed, } file { "/etc/cups/client.conf": - ensure => present, - content => template("cups/client.conf.erb"), - mode => 0644, - owner => root, - group => $operatingsystem ? { - openbsd => wheel, - default => lp, - }, - require => Package["cups"], + ensure => present, + content => template("cups/client.conf.erb"), + mode => 0644, + owner => root, + group => $operatingsystem ? { + openbsd => wheel, + default => lp, + }, + require => Package["cups"], } case $operatingsystem { - openbsd: { + openbsd: { exec { "cups-enable": command => $operatingsystemrelease ? { /4\.[1-8]/ => "echo y | cups-enable", @@ -30,8 +30,8 @@ class cups::client { user => "root", creates => "/usr/bin/lpr.pre-cups", require => Package["cups"], - } - } + } + } } } @@ -41,7 +41,7 @@ class cups::client { class cups::server inherits cups::client { package { [ "ghostscript", "system-config-printer" ]: - ensure => installed, + ensure => installed, } file { "/etc/cups/cupsd.conf": @@ -57,9 +57,9 @@ class cups::server inherits cups::client { } service { "cups": - ensure => running, - enable => true, - require => Package["cups"], + ensure => running, + enable => true, + require => Package["cups"], } file { "/etc/cups/ppd": @@ -69,9 +69,9 @@ class cups::server inherits cups::client { group => lp, require => Package["cups"], } - + File["/etc/cups/client.conf"] { - content => "ServerName 127.0.0.1\n", + content => "ServerName 127.0.0.1\n", } } @@ -157,12 +157,12 @@ class cups::lpd { include inetd::server package { "cups-lpd": - ensure => installed, + ensure => installed, } inetd::service { "cups-lpd": - ensure => present, - require => Package["cups-lpd"], + ensure => present, + require => Package["cups-lpd"], } } @@ -175,26 +175,26 @@ class cups::samba { include samba::server file { [ "/etc/samba/drivers", - "/usr/share/cups/drivers", - "/usr/share/cups/drivers/x64", ]: - ensure => directory, - mode => 0755, - owner => root, - group => root, - require => [ Package["samba"], - Package["cups"], ], + "/usr/share/cups/drivers", + "/usr/share/cups/drivers/x64", ]: + ensure => directory, + mode => 0755, + owner => root, + group => root, + require => [ Package["samba"], + Package["cups"], ], } define driverfile() { - file { "/usr/share/cups/drivers/${name}": - ensure => present, - source => "puppet:///modules/cups/drivers/${name}", - mode => 0644, - owner => root, - group => root, - require => [ File["/usr/share/cups/drivers"], - File["/usr/share/cups/drivers/x64"], ], - } + file { "/usr/share/cups/drivers/${name}": + ensure => present, + source => "puppet:///modules/cups/drivers/${name}", + mode => 0644, + owner => root, + group => root, + require => [ File["/usr/share/cups/drivers"], + File["/usr/share/cups/drivers/x64"], ], + } } driverfile { "cups6.inf": } @@ -218,11 +218,11 @@ class cups::samba { driverfile { "x64/pscript5.dll": } file { "/etc/cron.hourly/update-printer-inf.sh": - ensure => present, - source => "puppet:///modules/cups/update-printer-inf.sh", - mode => 0755, - owner => root, - group => root, + ensure => present, + source => "puppet:///modules/cups/update-printer-inf.sh", + mode => 0755, + owner => root, + group => root, } } @@ -233,24 +233,24 @@ class cups::samba { class cups::snmp { package { "net-snmp-utils": - ensure => installed, + ensure => installed, } file { "/etc/cron.hourly/printer-details.py": - ensure => present, - source => "puppet:///modules/cups/printer-details.py", - mode => 0755, - owner => root, - group => root, - require => Package["net-snmp-utils"], + ensure => present, + source => "puppet:///modules/cups/printer-details.py", + mode => 0755, + owner => root, + group => root, + require => Package["net-snmp-utils"], } exec { "create-details-dir": - command => "umask 022 ; mkdir /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - unless => "test -d /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details", - require => Package["cups"], + command => "umask 022 ; mkdir /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + unless => "test -d /usr/share/doc/cups-`rpm -q --queryformat='%{VERSION}' cups`/details", + require => Package["cups"], } } diff --git a/custom/manifests/init.pp b/custom/manifests/init.pp index 9bd6ab7..1c93848 100644 --- a/custom/manifests/init.pp +++ b/custom/manifests/init.pp @@ -50,11 +50,11 @@ 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 { "ftp","http","https": { $fetch_cmd = "wget -q -O '${name}' '${source}'" @@ -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}", - default => undef, + file { $name: + ensure => $ensure, + source => $method ? { + "file" => $path, + "puppet" => $source, + default => undef, }, - mode => "${mode}" ? { - "NONE" => undef, - default => "${mode}", - }, - owner => "${owner}" ? { + mode => $mode ? { "NONE" => undef, - default => "${owner}", + default => $mode, }, - group => "${group}" ? { + owner => $owner ? { "NONE" => undef, - default => "${group}", + default => $owner, }, - seltype => "${seltype}" ? { + group => $group ? { "NONE" => undef, - default => "${seltype}", + default => $group, + }, + seltype => $seltype ? { + "NONE" => undef, + default => $seltype, }, } @@ -132,7 +132,7 @@ class custom::rootpassword { default: { user { "root": ensure => present, - password => "${root_password}", + password => $root_password, } } } diff --git a/dhcp/manifests/init.pp b/dhcp/manifests/init.pp index 1422827..403c975 100644 --- a/dhcp/manifests/init.pp +++ b/dhcp/manifests/init.pp @@ -2,36 +2,36 @@ class dhcp::server::common { package { "dhcp": - name => $operatingsystem ? { + name => $operatingsystem ? { Debian => "dhcp3-server", - OpenBSD => "isc-dhcp-server", + OpenBSD => "isc-dhcp-server", Ubuntu => "dhcp3-server", - default => "dhcp", - }, - ensure => installed, + default => "dhcp", + }, + ensure => installed, } file { "dhcpd.leases": - name => $operatingsystem ? { + name => $operatingsystem ? { Debian => "/var/lib/dhcp3/dhcpd.leases", - OpenBSD => "/var/db/dhcpd.leases", + OpenBSD => "/var/db/dhcpd.leases", Ubuntu => "/var/lib/dhcp3/dhcpd.leases", - default => "/var/lib/dhcpd/dhcpd.leases", - }, - ensure => present, - owner => $operatingsystem ? { + default => "/var/lib/dhcpd/dhcpd.leases", + }, + ensure => present, + owner => $operatingsystem ? { debian => dhcpd, ubuntu => dhcpd, default => root, }, - group => $operatingsystem ? { + group => $operatingsystem ? { Debian => dhcpd, - OpenBSD => wheel, + OpenBSD => wheel, Ubuntu => dhcpd, - default => root, - }, - require => Package["dhcp"], - before => Service["dhcpd"], + default => root, + }, + require => Package["dhcp"], + before => Service["dhcpd"], } if $operatingsystem == "OpenBSD" and $operatingsystemrelease !~ /4\.[1-8]/ { @@ -55,8 +55,8 @@ class dhcp::server::common { Ubuntu => "dhcp3-server", default => "dhcpd", }, - ensure => running, - enable => true, + ensure => running, + enable => true, binary => $operatingsystem ? { OpenBSD => "/usr/local/sbin/dhcpd", default => undef, @@ -65,7 +65,7 @@ class dhcp::server::common { OpenBSD => "/usr/local/sbin/dhcpd -q", default => undef, }, - require => Package["dhcp"], + require => Package["dhcp"], } } @@ -90,7 +90,7 @@ class dhcp::server inherits dhcp::server::common { }, notify => Service["dhcpd"], } - + } @@ -99,36 +99,36 @@ class dhcp::server::ldap inherits dhcp::server::common { include ldap::client::python file { "/usr/local/sbin/dhcpdump.py": - ensure => present, - source => "puppet:///modules/dhcp/dhcpdump.py", - mode => 0755, - owner => root, - group => $operatingsystem ? { - OpenBSD => wheel, - default => root, - }, + ensure => present, + source => "puppet:///modules/dhcp/dhcpdump.py", + mode => 0755, + owner => root, + group => $operatingsystem ? { + OpenBSD => wheel, + default => root, + }, } file { "/etc/dhcpd.conf.in": - ensure => present, - source => [ "puppet:///files/dhcp/dhcpd.conf.in.${hostname}", - "puppet:///files/dhcp/dhcpd.conf.in", ], - mode => 0644, - owner => root, - group => $operatingsystem ? { - OpenBSD => wheel, - default => root, - }, - require => Package["dhcp"], + ensure => present, + source => [ "puppet:///files/dhcp/dhcpd.conf.in.${hostname}", + "puppet:///files/dhcp/dhcpd.conf.in", ], + mode => 0644, + owner => root, + group => $operatingsystem ? { + OpenBSD => wheel, + default => root, + }, + require => Package["dhcp"], } exec { "generate-dhcp-conf": - path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin", - command => "dhcpdump.py /etc/dhcpd.conf.in* > /etc/dhcpd.conf", - unless => "dhcpdump.py /etc/dhcpd.conf.in* | diff /etc/dhcpd.conf -", - require => [ File["/etc/dhcpd.conf.in"], - File["/usr/local/sbin/dhcpdump.py"], ], - notify => Service["dhcpd"], + path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin", + command => "dhcpdump.py /etc/dhcpd.conf.in* > /etc/dhcpd.conf", + unless => "dhcpdump.py /etc/dhcpd.conf.in* | diff /etc/dhcpd.conf -", + require => [ File["/etc/dhcpd.conf.in"], + File["/usr/local/sbin/dhcpdump.py"], ], + notify => Service["dhcpd"], } } diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp index 2e613d8..8e81573 100644 --- a/dns/manifests/init.pp +++ b/dns/manifests/init.pp @@ -62,7 +62,7 @@ class dns::server { } } - file { "${chroot}${rndckey}": + file { "${chroot}${rndckey}": ensure => present, mode => 0640, owner => "root", @@ -111,8 +111,8 @@ class dns::server { } file { "named.conf": - path => "${chroot}${config}", ensure => present, + path => "${chroot}${config}", mode => 0640, owner => "root", group => $group, @@ -123,7 +123,7 @@ class dns::server { notify => Exec["generate-named-conf"], } file { "/usr/local/sbin/generate-named-conf.sh": - ensure => present, + ensure => present, content => template("dns/generate-named-conf.sh.erb"), mode => 0755, owner => "root", @@ -342,5 +342,5 @@ class dns::nsupdate { minute => "*/5", require => File["/usr/local/sbin/nsupdate.sh"], } - + } diff --git a/dovecot/manifests/init.pp b/dovecot/manifests/init.pp index deb1efd..3cb4b38 100644 --- a/dovecot/manifests/init.pp +++ b/dovecot/manifests/init.pp @@ -96,7 +96,7 @@ class dovecot::server inherits dovecot::common { mode => 0644, owner => root, group => root, - notify => Service["dovecot"], + notify => Service["dovecot"], } } diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp index f82d7b0..4900ad5 100644 --- a/ejabberd/manifests/init.pp +++ b/ejabberd/manifests/init.pp @@ -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" ], } diff --git a/func/manifests/init.pp b/func/manifests/init.pp index 8bc822f..28f64f2 100644 --- a/func/manifests/init.pp +++ b/func/manifests/init.pp @@ -15,7 +15,7 @@ class func::minion { require => Package["func"], notify => Service["funcd"], } - + file { "/etc/pki/certmaster/${hostname}.pem": ensure => present, source => "${puppet_ssldir}/private_keys/${fqdn}.pem", @@ -43,7 +43,7 @@ class func::minion { require => Package["func"], notify => Service["funcd"], } - + service { "funcd": ensure => running, enable => true, @@ -94,5 +94,5 @@ class func::server inherits func::minion { group => root, require => Package["func"], } - + } diff --git a/git/manifests/init.pp b/git/manifests/init.pp index 46763c8..6679770 100644 --- a/git/manifests/init.pp +++ b/git/manifests/init.pp @@ -8,7 +8,7 @@ class git::client { "ubuntu" => "git-core", default => "git", }, - ensure => installed, + ensure => installed, } } @@ -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], } } } diff --git a/hastymail/manifests/init.pp b/hastymail/manifests/init.pp index c4044ab..fb76ea8 100644 --- a/hastymail/manifests/init.pp +++ b/hastymail/manifests/init.pp @@ -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": @@ -48,9 +48,9 @@ class hastymail { } file { "/etc/hastymail2/hastymail2.rc": ensure => present, - mode => 0640, - owner => "root", - group => "${apache::sslserver::group}", + mode => 0640, + owner => "root", + group => $apache::sslserver::group, } } diff --git a/inetd/manifests/init.pp b/inetd/manifests/init.pp index 56d89c7..575b0c1 100644 --- a/inetd/manifests/init.pp +++ b/inetd/manifests/init.pp @@ -6,15 +6,15 @@ class inetd::server { case $operatingsystem { - centos,fedora,ubuntu,debian: { - include inetd::server::xinetd - } - openbsd: { - include inetd::server::inetd - } - default: { - fail("Inetd module not supported in ${operatingsystem}") - } + centos,fedora,ubuntu,debian: { + include inetd::server::xinetd + } + openbsd: { + include inetd::server::inetd + } + default: { + fail("Inetd module not supported in ${operatingsystem}") + } } } @@ -29,13 +29,13 @@ class inetd::server { class inetd::server::xinetd { package { "xinetd": - ensure => installed, + ensure => installed, } service { "xinetd": - ensure => running, - enable => true, - require => Package["xinetd"], + ensure => running, + enable => true, + require => Package["xinetd"], } } @@ -75,15 +75,15 @@ class inetd::server::inetd { define inetd::service($ensure = present) { case $operatingsystem { - centos,fedora,ubuntu,debian: { - service { "${name}": - enable => $ensure ? { - present => true, - absent => false, - }, - notify => Service["xinetd"], - } - } + centos,fedora,ubuntu,debian: { + service { $name: + enable => $ensure ? { + present => true, + absent => false, + }, + notify => Service["xinetd"], + } + } openbsd: { exec { "enable-inetd-${name}": command => $ensure ? { @@ -98,9 +98,9 @@ define inetd::service($ensure = present) { notify => Service["inetd"], } } - default: { - fail("Inetd module not supported in ${operatingsystem}") - } + default: { + fail("Inetd module not supported in ${operatingsystem}") + } } } diff --git a/irc/manifests/init.pp b/irc/manifests/init.pp index 952b686..531be14 100644 --- a/irc/manifests/init.pp +++ b/irc/manifests/init.pp @@ -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", diff --git a/iscsi/manifests/init.pp b/iscsi/manifests/init.pp index 26f021a..819651b 100644 --- a/iscsi/manifests/init.pp +++ b/iscsi/manifests/init.pp @@ -4,39 +4,39 @@ class iscsi::server { package { "scsi-target-utils": - ensure => installed, + ensure => installed, } service { "tgtd": - ensure => running, - enable => true, - require => Package["scsi-target-utils"], + ensure => running, + enable => true, + require => Package["scsi-target-utils"], } file { "/etc/tgt/targets.conf": - ensure => present, - source => [ "puppet:///files/iscsi/targets.conf.${fqdn}", - "puppet:///files/iscsi/targets.conf", - "puppet:///modules/iscsi/targets.conf", ], - mode => 0600, - owner => root, - group => root, - require => Package["scsi-target-utils"], + ensure => present, + source => [ "puppet:///files/iscsi/targets.conf.${fqdn}", + "puppet:///files/iscsi/targets.conf", + "puppet:///modules/iscsi/targets.conf", ], + mode => 0600, + owner => root, + group => root, + require => Package["scsi-target-utils"], } file { "/etc/tgt/target.d": - ensure => directory, - mode => 0700, - owner => root, - group => root, - require => Package["scsi-target-utils"], + ensure => directory, + mode => 0700, + owner => root, + group => root, + require => Package["scsi-target-utils"], } exec { "iscsi-refresh": - command => "tgt-admin -e", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - onlyif => "tgt-admin -e -p | egrep '^tgtadm '", - require => Service["tgtd"], + command => "tgt-admin -e", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + onlyif => "tgt-admin -e -p | egrep '^tgtadm '", + require => Service["tgtd"], } } @@ -74,24 +74,24 @@ define iscsi::target($tid, $initiator = "ALL", $ensure = "present") { $iqn = sprintf("iqn.2005-08.tgt:%s%s", $hostname, regsubst($name, "/", ".", "G")) case $ensure { - "present": { - file { "/etc/tgt/target.d/${tid}.conf": - ensure => present, - content => template("iscsi/tid.conf.erb"), - mode => 0600, - owner => root, - group => root, - require => File["/etc/tgt/target.d"], - before => Exec["iscsi-refresh"], - } - - } - "absent": { - file { "/etc/tgt/target.d/${tid}.conf": - ensure => absent, - before => Exec["iscsi-refresh"], - } - } + "present": { + file { "/etc/tgt/target.d/${tid}.conf": + ensure => present, + content => template("iscsi/tid.conf.erb"), + mode => 0600, + owner => root, + group => root, + require => File["/etc/tgt/target.d"], + before => Exec["iscsi-refresh"], + } + + } + "absent": { + file { "/etc/tgt/target.d/${tid}.conf": + ensure => absent, + before => Exec["iscsi-refresh"], + } + } } } @@ -102,13 +102,13 @@ define iscsi::target($tid, $initiator = "ALL", $ensure = "present") { class iscsi::initiator { package { "iscsi-initiator-utils": - ensure => installed, + ensure => installed, } service { "iscsid": - ensure => running, - enable => true, - require => Package["iscsi-initiator-utils"], + ensure => running, + enable => true, + require => Package["iscsi-initiator-utils"], } } @@ -133,10 +133,10 @@ define iscsi::connect($portal) { include iscsi::initiator exec { "iscsi-connect-${name}": - path => "/bin:/usr/bin:/sbin:/usr/sbin", - command => "iscsiadm --mode discovery --type sendtargets --portal ${portal} && iscsiadm --mode node --targetname ${name} --portal ${portal} --login && sleep 5", - unless => "iscsiadm --mode session | egrep '${portal}:[0-9]*,[0-9]* ${name}'\$", - require => Service["iscsid"], + path => "/bin:/usr/bin:/sbin:/usr/sbin", + command => "iscsiadm --mode discovery --type sendtargets --portal ${portal} && iscsiadm --mode node --targetname ${name} --portal ${portal} --login && sleep 5", + unless => "iscsiadm --mode session | egrep '${portal}:[0-9]*,[0-9]* ${name}'\$", + require => Service["iscsid"], } } diff --git a/kerberos/manifests/init.pp b/kerberos/manifests/init.pp index c040ba3..91fe76f 100644 --- a/kerberos/manifests/init.pp +++ b/kerberos/manifests/init.pp @@ -19,26 +19,26 @@ class kerberos::client { case $operatingsystem { - centos,fedora: { - package { "krb5-workstation": - ensure => installed, - } - } + centos,fedora: { + package { "krb5-workstation": + ensure => installed, + } + } } file { "krb5.conf": - path => $operatingsystem ? { - openbsd => "/etc/kerberosV/krb5.conf", - default => "/etc/krb5.conf", - }, - ensure => present, - content => template("kerberos/krb5.conf.erb"), - mode => 0644, - owner => root, - group => $operatingsystem ? { - openbsd => wheel, - default => root, - }, + path => $operatingsystem ? { + openbsd => "/etc/kerberosV/krb5.conf", + default => "/etc/krb5.conf", + }, + ensure => present, + content => template("kerberos/krb5.conf.erb"), + mode => 0644, + owner => root, + group => $operatingsystem ? { + openbsd => wheel, + default => root, + }, } } @@ -99,7 +99,7 @@ class kerberos::auth { class kerberos::server inherits kerberos::client { package { "krb5-server": - ensure => installed, + ensure => installed, } if $kerberos_datadir { @@ -160,15 +160,15 @@ class kerberos::server inherits kerberos::client { # $name: # Keytab file path. # $principals: -# List of principals to be added into keytab +# List of principals to be added into keytab # $ensure: -# Set to present to create keytab and absent to remove it +# Set to present to create keytab and absent to remove it # $owner: -# Owner for keytab file +# Owner for keytab file # $group: -# Group for keytab file +# Group for keytab file # $mode: -# Permissions for keytab file +# Permissions for keytab file # # === Sample usage # @@ -180,23 +180,23 @@ class kerberos::server inherits kerberos::client { define kerberos::keytab($principals = [], $ensure = present, $owner = "root", $group = "", $mode = "0600") { case $group { - "": { - case $operatingsystem { - openbsd: { $real_group = "wheel" } - default: { $real_group = "root" } - } - } - default: { - $real_group = $group - } + "": { + case $operatingsystem { + openbsd: { $real_group = "wheel" } + default: { $real_group = "root" } + } + } + default: { + $real_group = $group + } } - file { "${name}": - ensure => $ensure, - content => template("kerberos/keytab.erb"), - mode => "${mode}", - owner => "${owner}", - group => "${real_group}", + file { $name: + ensure => $ensure, + content => template("kerberos/keytab.erb"), + mode => $mode, + owner => $owner, + group => $real_group, } } diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp index 411a9e0..74d03a5 100644 --- a/ldap/manifests/init.pp +++ b/ldap/manifests/init.pp @@ -90,7 +90,7 @@ class ldap::auth inherits ldap::client { require => Package["nscd"], } } - Ubuntu: { + Ubuntu: { package { "ldap-auth-client": ensure => installed, } @@ -111,23 +111,23 @@ class ldap::auth inherits ldap::client { "set base ${ldap_basedn}", "set nss_paged_results yes", "set pam_password exop", - "rm rootbinddn", + "rm rootbinddn", "set ssl on", ], onlyif => [ "get uri != '${ldap_uri}'", "get base != ${ldap_basedn}", "get nss_paged_results != yes", "get pam_password != exop", - "get rootbinddn == 'cn=manager,dc=example,dc=net'", + "get rootbinddn == 'cn=manager,dc=example,dc=net'", "get ssl != on", ], } } - Debian: { + Debian: { package {[ "libnss-ldap", - "libpam-ldap" ]: + "libpam-ldap" ]: ensure => installed, } ## Debian lacks some lenses. nss-ldap-conf and pam_ldap-conf needs corresponding files -## to /usr/share/augeas/lenses/dist/spacevars.aug. More info at: +## to /usr/share/augeas/lenses/dist/spacevars.aug. More info at: ## https://github.com/jwm/augeas/commit/8f768f45779048cbd95b5b7d71682b808d41bfd3 ## There isn't lens for nsswitch.conf either. nss-ldap-conf and pam_ldap-conf are tested, nsswitch isn't. # augeas { "nss-ldap-conf": @@ -144,7 +144,7 @@ class ldap::auth inherits ldap::client { # "get pam_password != exop", # "get rootbinddn == 'cn=manager,dc=example,dc=net'", # "get ssl != on", ], -# require => Package["libnss-ldap"], +# require => Package["libnss-ldap"], # } # augeas { "pam_ldap-conf": # context => "/files/etc/pam_ldap.conf", @@ -160,7 +160,7 @@ class ldap::auth inherits ldap::client { # "get pam_password != exop", # "get rootbinddn == 'cn=manager,dc=example,dc=net'", # "get ssl != on", ], -# require => Package["libpam-ldap"], +# require => Package["libpam-ldap"], # } # augeas { "nsswitch-conf": # context => "/files/etc/nsswitch.conf", @@ -170,7 +170,7 @@ class ldap::auth inherits ldap::client { # onlyif => [ "get passwd: != 'files ldap'", # "get group: != 'files ldap'", # "get shadow: != 'files ldap'", ], -# require => [ Augeas["pam_ldap-conf"], +# require => [ Augeas["pam_ldap-conf"], # Augeas["nss-ldap-conf"], ], # } } @@ -215,7 +215,7 @@ class ldap::client { "debian" => "ldap-utils", "ubuntu" => "ldap-utils", "openbsd" => "openldap-client", - default => "openldap-clients", + default => "openldap-clients", }, ensure => $operatingsystem ? { darwin => absent, @@ -227,16 +227,16 @@ class ldap::client { ensure => present, content => template("ldap/ldap.conf.erb"), path => $operatingsystem ? { - "debian" => "/etc/ldap/ldap.conf", - "ubuntu" => "/etc/ldap/ldap.conf", - default => "/etc/openldap/ldap.conf", + "debian" => "/etc/ldap/ldap.conf", + "ubuntu" => "/etc/ldap/ldap.conf", + default => "/etc/openldap/ldap.conf", }, mode => 0644, owner => root, group => $operatingsystem ? { "darwin" => wheel, "openbsd" => wheel, - default => root, + default => root, }, require => Package["openldap-client"], } @@ -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,10 +427,10 @@ class ldap::server { } file { "/srv/ldap": ensure => link, - target => "${ldap_datadir}", - require => File["${ldap_datadir}"], - } - } else { + target => $ldap_datadir, + require => File[$ldap_datadir], + } + } else { file { "/srv/ldap": ensure => directory, mode => 0700, @@ -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, diff --git a/lynx/manifests/init.pp b/lynx/manifests/init.pp index 3286c39..3f7d5a2 100644 --- a/lynx/manifests/init.pp +++ b/lynx/manifests/init.pp @@ -5,7 +5,7 @@ # # $www_default_url: # Default starting URL. -# +# class lynx { if ! $www_default_url { diff --git a/mercurial/manifests/init.pp b/mercurial/manifests/init.pp index 61c5cbc..d5919e0 100644 --- a/mercurial/manifests/init.pp +++ b/mercurial/manifests/init.pp @@ -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", diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp index f4b02a9..84c90b7 100644 --- a/munin/manifests/init.pp +++ b/munin/manifests/init.pp @@ -2,61 +2,61 @@ # Install and configure munin node. # class munin::node { - + package { "munin-node": - ensure => installed, + ensure => installed, } - + service { "munin-node": - name => $operatingsystem ? { + name => $operatingsystem ? { OpenBSD => $operatingsystemrelease ? { /4\.[1-8]/ => "munin-node", default => "munin_node", }, default => "munin-node", }, - ensure => running, - enable => true, - require => Package["munin-node"], - start => $operatingsystem ? { - OpenBSD => $operatingsystemrelease ? { + ensure => running, + enable => true, + require => Package["munin-node"], + start => $operatingsystem ? { + OpenBSD => $operatingsystemrelease ? { /4\.[1-8]/ => "/usr/bin/install -d -o _munin /var/run/munin; /usr/local/sbin/munin-node", default => undef, }, - default => undef, - }, - stop => $operatingsystem ? { - OpenBSD => "/usr/bin/pkill -f /usr/local/sbin/munin-node", - default => undef, - }, + default => undef, + }, + stop => $operatingsystem ? { + OpenBSD => "/usr/bin/pkill -f /usr/local/sbin/munin-node", + default => undef, + }, } file { "/etc/munin/munin-node.conf": - ensure => present, - content => template("munin/munin-node.conf.erb"), - owner => root, - group => $operatingsystem ? { - OpenBSD => wheel, - default => root, - }, - mode => 0644, - require => Package["munin-node"], - notify => Exec["munin-node-configure"], + ensure => present, + content => template("munin/munin-node.conf.erb"), + owner => root, + group => $operatingsystem ? { + OpenBSD => wheel, + default => root, + }, + mode => 0644, + require => Package["munin-node"], + notify => Exec["munin-node-configure"], } - + @@file { "/etc/munin/nodes.d/${homename}.conf": - content => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n", - ensure => present, - tag => "munin", - notify => Exec["generate-munin-conf"], + ensure => present, + content => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n", + tag => "munin", + notify => Exec["generate-munin-conf"], } - + exec { "munin-node-configure": - command => "munin-node-configure --shell --remove-also 2>/dev/null | /bin/sh", - path => "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin", - user => root, - refreshonly => true, - notify => Service["munin-node"], + command => "munin-node-configure --shell --remove-also 2>/dev/null | /bin/sh", + path => "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin", + user => root, + refreshonly => true, + notify => Service["munin-node"], } } @@ -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"], } @@ -108,7 +108,7 @@ define munin::snmpnode($snmp_community="public", $snmp_version="2") { # === Parameters # # $name: -# Plugin name to install. +# Plugin name to install. # $config: # Configuration file name associated with plugin. Defaults to none. # @@ -121,71 +121,71 @@ define munin::snmpnode($snmp_community="public", $snmp_version="2") { define munin::plugin($config = "") { case $operatingsystem { - OpenBSD: { - file { "/usr/local/libexec/munin/plugins/${name}": - ensure => present, - source => "puppet:///modules/munin/plugins/${name}", - owner => root, - group => wheel, - mode => 0755, - require => Package["munin-node"], - } + OpenBSD: { + file { "/usr/local/libexec/munin/plugins/${name}": + ensure => present, + source => "puppet:///modules/munin/plugins/${name}", + owner => root, + group => wheel, + mode => 0755, + require => Package["munin-node"], + } + } + default: { + file { "/usr/share/munin/plugins/${name}": + ensure => present, + source => "puppet:///modules/munin/plugins/${name}", + owner => root, + group => root, + mode => 0755, + require => Package["munin-node"], + } } - default: { - file { "/usr/share/munin/plugins/${name}": - ensure => present, - source => "puppet:///modules/munin/plugins/${name}", - owner => root, - group => root, - mode => 0755, - require => Package["munin-node"], - } - } } if ($config) { - file { "/etc/munin/plugin-conf.d/${config}": - ensure => present, - source => [ "puppet:///files/munin/plugin-conf/${config}.${fqdn}", - "puppet:///files/munin/plugin-conf/${config}", - "puppet:///modules/munin/plugin-conf/${config}", ], - owner => root, - group => $operatingsystem ? { - OpenBSD => wheel, - default => root, - }, - mode => 0644, - notify => Service["munin-node"], - require => $operatingsystem ? { - OpenBSD => File["/usr/local/libexec/munin/plugins/${name}"], - default => File["/usr/share/munin/plugins/${name}"], + file { "/etc/munin/plugin-conf.d/${config}": + ensure => present, + source => [ "puppet:///files/munin/plugin-conf/${config}.${fqdn}", + "puppet:///files/munin/plugin-conf/${config}", + "puppet:///modules/munin/plugin-conf/${config}", ], + owner => root, + group => $operatingsystem ? { + OpenBSD => wheel, + default => root, }, - } + mode => 0644, + notify => Service["munin-node"], + require => $operatingsystem ? { + OpenBSD => File["/usr/local/libexec/munin/plugins/${name}"], + default => File["/usr/share/munin/plugins/${name}"], + }, + } } case $operatingsystem { - OpenBSD: { - exec { "munin-enable-${name}": - command => "ln -s /usr/local/libexec/munin/plugins/${name} /etc/munin/plugins/${name}", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - onlyif => [ "test ! -h /etc/munin/plugins/${name}", - "/usr/local/libexec/munin/plugins/${name} autoconf", ], - notify => Service["munin-node"], - require => File["/usr/local/libexec/munin/plugins/${name}"], - } - } - default: { - exec { "munin-enable-${name}": - command => "ln -s /usr/share/munin/plugins/${name} /etc/munin/plugins/${name}", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - onlyif => [ "test ! -h /etc/munin/plugins/${name}", - "/usr/share/munin/plugins/${name} autoconf", ], - notify => Service["munin-node"], - require => File["/usr/share/munin/plugins/${name}"], - } - } + OpenBSD: { + exec { "munin-enable-${name}": + command => "ln -s /usr/local/libexec/munin/plugins/${name} /etc/munin/plugins/${name}", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + onlyif => [ "test ! -h /etc/munin/plugins/${name}", + "/usr/local/libexec/munin/plugins/${name} autoconf", ], + notify => Service["munin-node"], + require => File["/usr/local/libexec/munin/plugins/${name}"], + } + } + default: { + exec { "munin-enable-${name}": + command => "ln -s /usr/share/munin/plugins/${name} /etc/munin/plugins/${name}", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + onlyif => [ "test ! -h /etc/munin/plugins/${name}", + "/usr/share/munin/plugins/${name} autoconf", ], + notify => Service["munin-node"], + require => File["/usr/share/munin/plugins/${name}"], + } + } } } @@ -198,13 +198,13 @@ define munin::plugin($config = "") { # * Storedconfigs # class munin::server { - + package { "munin": - ensure => installed, + ensure => installed, } - + 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,45 +248,45 @@ 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], } } file { "/etc/munin/nodes.d": - ensure => directory, - purge => true, - force => true, - recurse => true, - owner => root, - group => root, - mode => 0644, - source => "puppet:///modules/custom/empty", - require => Package["munin"], + ensure => directory, + purge => true, + force => true, + recurse => true, + owner => root, + group => root, + mode => 0644, + source => "puppet:///modules/custom/empty", + require => Package["munin"], } - + file { "/etc/munin/munin.conf.in": - ensure => present, - source => [ "puppet:///files/munin/munin.conf.in", - "puppet:///modules/munin/munin.conf.in", ], - owner => root, - group => root, - mode => 0644, - require => Package["munin"], - notify => Exec["generate-munin-conf"], + ensure => present, + source => [ "puppet:///files/munin/munin.conf.in", + "puppet:///modules/munin/munin.conf.in", ], + owner => root, + group => root, + mode => 0644, + require => Package["munin"], + notify => Exec["generate-munin-conf"], } - + exec { "generate-munin-conf": - command => "cat /etc/munin/munin.conf.in /etc/munin/nodes.d/*.conf > /etc/munin/munin.conf", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - refreshonly => true, - require => File["/etc/munin/munin.conf.in"], + command => "cat /etc/munin/munin.conf.in /etc/munin/nodes.d/*.conf > /etc/munin/munin.conf", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + refreshonly => true, + require => File["/etc/munin/munin.conf.in"], } - + File <<| tag == "munin" |>> - + } diff --git a/mutt/manifests/init.pp b/mutt/manifests/init.pp index 1912646..316db88 100644 --- a/mutt/manifests/init.pp +++ b/mutt/manifests/init.pp @@ -9,9 +9,9 @@ class mutt { $mail_server = "mail.${domain}" } if ! $mail_domain { - $mail_domain = "${domain}" + $mail_domain = $domain } - + case $operatingsystem { openbsd: { $muttconfdir = "/etc/mutt/Muttrc" } default: { $muttconfdir = "/etc" } @@ -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, @@ -37,5 +37,5 @@ class mutt { }, require => Exec["add-local-mutt-config"], } - + } diff --git a/mysql/manifests/init.pp b/mysql/manifests/init.pp index e7fed1d..3e43424 100644 --- a/mysql/manifests/init.pp +++ b/mysql/manifests/init.pp @@ -20,11 +20,11 @@ class mysql::client { class mysql::server { package { "mysql-server": - ensure => installed, + ensure => installed, } 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], } } } @@ -68,30 +68,30 @@ class mysql::server { "debian" => "mysql", default => "mysqld", }, - ensure => running, - enable => true, - require => File["/srv/mysql"], + ensure => running, + enable => true, + require => File["/srv/mysql"], } file { "/etc/my.cnf": - ensure => present, - source => [ "puppet:///files/mysql/my.cnf.${hostname}", - "puppet:///files/mysql/my.cnf", - "puppet:///modules/mysql/my.cnf", ], - mode => 0644, - owner => root, - group => root, - require => Package["mysql-server"], - notify => Service["mysqld"], + ensure => present, + source => [ "puppet:///files/mysql/my.cnf.${hostname}", + "puppet:///files/mysql/my.cnf", + "puppet:///modules/mysql/my.cnf", ], + mode => 0644, + owner => root, + group => root, + require => Package["mysql-server"], + notify => Service["mysqld"], } file { "/etc/logrotate.d/mysql": - ensure => present, - source => "puppet:///modules/mysql/mysql.logrotate", - mode => 0644, - owner => root, - group => root, - require => Package["mysql-server"], + ensure => present, + source => "puppet:///modules/mysql/mysql.logrotate", + mode => 0644, + owner => root, + group => root, + require => Package["mysql-server"], } file { "/var/lib/mysql": diff --git a/mythtv/manifests/init.pp b/mythtv/manifests/init.pp index 34db22c..3d8079f 100644 --- a/mythtv/manifests/init.pp +++ b/mythtv/manifests/init.pp @@ -72,7 +72,8 @@ class mythtv::backend { } file { "/root/.mythtv": - ensure => "/etc/mythtv", + ensure => link, + target => "/etc/mythtv", force => true, require => Package["mythtv-backend"], } diff --git a/network/manifests/init.pp b/network/manifests/init.pp index 48f3d76..d96d7f6 100644 --- a/network/manifests/init.pp +++ b/network/manifests/init.pp @@ -5,20 +5,20 @@ # class network::helper::restart { case $operatingsystem { - centos,fedora: { - exec { "restart-network": - command => "/sbin/service network restart", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - refreshonly => true, - } - } - openbsd: { - exec { "restart-network": - command => "/sbin/route delete default ; /bin/sh /etc/netstart", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - refreshonly => true, - } - } + centos,fedora: { + exec { "restart-network": + command => "/sbin/service network restart", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + refreshonly => true, + } + } + openbsd: { + exec { "restart-network": + command => "/sbin/route delete default ; /bin/sh /etc/netstart", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + refreshonly => true, + } + } debian,ubuntu: { exec { "restart-network": cwd => "/etc/network", @@ -101,12 +101,12 @@ class network::hostname { # $name: # Network device name. # $ipaddr: -# IP address for interface. Use dhcp for DHCP configuration and none -# if interface just needs to be brought up. Defaults to none. +# IP address for interface. Use dhcp for DHCP configuration and none +# if interface just needs to be brought up. Defaults to none. # $eaddr: # Ethernet address. Overrides udev configuration. # $netmask: -# Netmask for interface. Required only when $ipaddr is used. +# Netmask for interface. Required only when $ipaddr is used. # $ip6addr: # IPv6 address for interface. Use auto for autoconfigured address. # Defaults to none. @@ -115,7 +115,7 @@ class network::hostname { # $bridge: # Array of interfaces to add to bridge. # $options: -# Custom options for interface (used only on OpenBSD). +# Custom options for interface (used only on OpenBSD). # $postcmd: # Custom commands to be executed after interface is up (used only on # OpenBSD). @@ -135,14 +135,14 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none", # try to determine boot protocol from ip address case $ipaddr { - dhcp: { $proto = "dhcp" } - none: { $proto = "none" } - default: { - $proto = "static" - case $netmask { - none: { fail("Netmask must be defined with ip address") } - } - } + dhcp: { $proto = "dhcp" } + none: { $proto = "none" } + default: { + $proto = "static" + case $netmask { + none: { fail("Netmask must be defined with ip address") } + } + } } case $eaddr { none: { @@ -155,39 +155,39 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none", } case $operatingsystem { - openbsd: { - file { "/etc/hostname.${name}": - ensure => present, - content => template("network/hostname.if.erb"), - mode => 0600, - owner => root, - group => wheel, - notify => Exec["restart-network"], - } - } - centos,fedora: { + openbsd: { + file { "/etc/hostname.${name}": + ensure => present, + content => template("network/hostname.if.erb"), + mode => 0600, + owner => root, + group => wheel, + notify => Exec["restart-network"], + } + } + centos,fedora: { if $bridge { network::interface { $bridge: options => [ "BRIDGE=${name}", "LINKDELAY=10" ], before => Exec["restart-interface-${name}"], } } - file { "/etc/sysconfig/network-scripts/ifcfg-${name}": - ensure => present, - content => template("network/ifcfg-if.erb"), - mode => 0644, - owner => root, - group => root, - notify => Exec["restart-interface-${name}"], - } - exec { "restart-interface-${name}": - command => "ifdown ${name} ; ifup ${name}", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - refreshonly => true, - require => File["/etc/sysconfig/network-scripts/ifcfg-${name}"], - } - } + file { "/etc/sysconfig/network-scripts/ifcfg-${name}": + ensure => present, + content => template("network/ifcfg-if.erb"), + mode => 0644, + owner => root, + group => root, + notify => Exec["restart-interface-${name}"], + } + exec { "restart-interface-${name}": + command => "ifdown ${name} ; ifup ${name}", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + refreshonly => true, + require => File["/etc/sysconfig/network-scripts/ifcfg-${name}"], + } + } debian,ubuntu: { include network::helper::debian file { "/etc/network/interfaces.d/${name}-addr.conf": @@ -209,9 +209,9 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none", } } } - default: { - fail("Network module not supported in ${operatingsystem}") - } + default: { + fail("Network module not supported in ${operatingsystem}") + } } } @@ -233,17 +233,17 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none", define network::route($gateway = "", $device, $ipv6gateway = "") { case $name { - "default": { - case $operatingsystem { - centos,fedora: { - include network::helper::restart + "default": { + case $operatingsystem { + centos,fedora: { + include network::helper::restart if "${gateway}" != "" { - augeas { "set-default-route": - context => "/files/etc/sysconfig/network", - changes => [ "set GATEWAY ${gateway}", - "set GATEWAYDEV ${device}", ], - notify => Exec["restart-network"], - } + augeas { "set-default-route": + context => "/files/etc/sysconfig/network", + changes => [ "set GATEWAY ${gateway}", + "set GATEWAYDEV ${device}", ], + notify => Exec["restart-network"], + } } if "${ipv6gateway}" != "" { augeas { "set-default-ipv6-route": @@ -252,18 +252,18 @@ define network::route($gateway = "", $device, $ipv6gateway = "") { notify => Exec["restart-network"], } } - } - openbsd: { - include network::helper::restart - file { "/etc/mygate": - ensure => present, - content => template("network/mygate.erb"), - mode => 644, - owner => root, - group => wheel, - notify => Exec["restart-network"], - } - } + } + openbsd: { + include network::helper::restart + file { "/etc/mygate": + ensure => present, + content => template("network/mygate.erb"), + mode => 0644, + owner => root, + group => wheel, + notify => Exec["restart-network"], + } + } debian,ubuntu: { include network::helper::restart include network::helper::debian @@ -277,12 +277,12 @@ define network::route($gateway = "", $device, $ipv6gateway = "") { require => File["/etc/network/interfaces.d/${device}-addr.conf"], } } - default: { - fail("Network module not supported in ${operatingsystem}") - } - } - } - default: { + default: { + fail("Network module not supported in ${operatingsystem}") + } + } + } + default: { if ipv6gateway != "" { fail("Custom IPv6 routes not supported yet.") } @@ -333,29 +333,29 @@ define network::route($gateway = "", $device, $ipv6gateway = "") { # define network::carp($password, $ipaddr, $netmask, $options = []) { case $operatingsystem { - openbsd: { - network::interface { "carp${name}": - ipaddr => "${ipaddr}", - netmask => "${netmask}", - options => [ "vhid ${name}", "pass ${password}", $options ], + openbsd: { + network::interface { "carp${name}": + ipaddr => $ipaddr, + netmask => $netmask, + options => [ "vhid ${name}", "pass ${password}", $options ], postcmd => [ "/usr/sbin/ndp -i carp${name} -- -accept_rtadv" ], - } - } - centos,fedora: { - include network::ucarp - file { "/etc/ucarp/vip-${name}.conf": - ensure => present, - content => template("network/vip.conf.erb"), - mode => 0600, - owner => root, - group => root, - require => Package["ucarp"], - notify => Service["ucarp"], - } - } - default: { - fail("Network module not supported in ${operatingsystem}") - } + } + } + centos,fedora: { + include network::ucarp + file { "/etc/ucarp/vip-${name}.conf": + ensure => present, + content => template("network/vip.conf.erb"), + mode => 0600, + owner => root, + group => root, + require => Package["ucarp"], + notify => Service["ucarp"], + } + } + default: { + fail("Network module not supported in ${operatingsystem}") + } } } @@ -366,13 +366,13 @@ define network::carp($password, $ipaddr, $netmask, $options = []) { # class network::ucarp { package { "ucarp": - ensure => installed, + ensure => installed, } service { "ucarp": - ensure => running, - enable => true, - hasstatus => true, - require => Package["ucarp"], + ensure => running, + enable => true, + hasstatus => true, + require => Package["ucarp"], } } @@ -397,19 +397,19 @@ define network::pppoe($username, $password, $device, $authtype = "pap") { include network::helper::restart case $operatingsystem { - openbsd: { - file { "/etc/hostname.${name}": - ensure => present, - content => template("network/hostname.pppoe.erb"), - mode => 0600, - owner => root, - group => wheel, - notify => Exec["restart-network"], - } - } - default: { - fail("Network module not supported in ${operatingsystem}") - } + openbsd: { + file { "/etc/hostname.${name}": + ensure => present, + content => template("network/hostname.pppoe.erb"), + mode => 0600, + owner => root, + group => wheel, + notify => Exec["restart-network"], + } + } + default: { + fail("Network module not supported in ${operatingsystem}") + } } } @@ -438,27 +438,27 @@ define network::pppoe($username, $password, $device, $authtype = "pap") { # define network::trunk($devices, $mode = 0, $ipaddr = "none", $netmask = "none") { case $operatingsystem { - centos,fedora: { - file { "/etc/modprobe.d/${name}.conf": - ensure => present, - content => "alias ${name} bonding\noptions ${name} miimon=100 mode=${mode}\n", - mode => 0644, - owner => root, - group => root, - } - network::interface { $devices: - options => [ "MASTER=${name}", "SLAVE=yes", ], - require => File["/etc/modprobe.d/${name}.conf"], - before => Network::Interface["${name}"], - } - network::interface { $name: - ipaddr => "${ipaddr}", - netmask => "${netmask}", - } - } - default: { - fail("Network module not supported in ${operatingsystem}") - } + centos,fedora: { + file { "/etc/modprobe.d/${name}.conf": + ensure => present, + content => "alias ${name} bonding\noptions ${name} miimon=100 mode=${mode}\n", + mode => 0644, + owner => root, + group => root, + } + network::interface { $devices: + options => [ "MASTER=${name}", "SLAVE=yes", ], + require => File["/etc/modprobe.d/${name}.conf"], + before => Network::Interface[$name], + } + network::interface { $name: + ipaddr => $ipaddr, + netmask => $netmask, + } + } + default: { + fail("Network module not supported in ${operatingsystem}") + } } } @@ -469,12 +469,12 @@ define network::trunk($devices, $mode = 0, $ipaddr = "none", $netmask = "none") # class network::helper::vlan { case $operatingsystem { - centos,fedora: { - augeas { "enable-vlan-support": - context => "/files/etc/sysconfig/network", - changes => "set VLAN yes", - } - } + centos,fedora: { + augeas { "enable-vlan-support": + context => "/files/etc/sysconfig/network", + changes => "set VLAN yes", + } + } } } @@ -505,25 +505,25 @@ class network::helper::vlan { define network::vlan($device, $ipaddr = "none", $netmask = "none", $options = []) { case $operatingsystem { - openbsd: { - network::interface { "vlan${name}": - options => [ "vlandev ${device}" ], - ipaddr => $ipaddr, - netmask => $netmask, - } - } - centos,fedora: { - include network::helper::vlan - network::interface { "${device}.${name}": - ipaddr => $ipaddr, - netmask => $netmask, + openbsd: { + network::interface { "vlan${name}": + options => [ "vlandev ${device}" ], + ipaddr => $ipaddr, + netmask => $netmask, + } + } + centos,fedora: { + include network::helper::vlan + network::interface { "${device}.${name}": + ipaddr => $ipaddr, + netmask => $netmask, options => $options, - require => Augeas["enable-vlan-support"], - } - } - default: { - fail("Network module not supported in ${operatingsystem}") - } + require => Augeas["enable-vlan-support"], + } + } + default: { + fail("Network module not supported in ${operatingsystem}") + } } } diff --git a/nfs/manifests/init.pp b/nfs/manifests/init.pp index 02680c6..75b8381 100644 --- a/nfs/manifests/init.pp +++ b/nfs/manifests/init.pp @@ -6,7 +6,7 @@ class nfs::client { include portmap::server package { "nfs-utils": - ensure => installed, + ensure => installed, } service { "nfslock": @@ -27,37 +27,37 @@ class nfs::server inherits nfs::client { include portmap::server file { "/etc/exports": - ensure => present, - source => [ "puppet:///files/nfs/exports.${fqdn}", - "puppet:///modules/nfs/exports", ], - mode => 0644, - owner => root, - group => root, - require => Package["nfs-utils"], - notify => Exec["exportfs"], + ensure => present, + source => [ "puppet:///files/nfs/exports.${fqdn}", + "puppet:///modules/nfs/exports", ], + mode => 0644, + owner => root, + group => root, + require => Package["nfs-utils"], + notify => Exec["exportfs"], } file { "/etc/sysconfig/nfs": - ensure => present, - source => "puppet:///modules/nfs/nfs.sysconfig", - mode => 0644, - owner => root, - group => root, - notify => Service["nfs"], + ensure => present, + source => "puppet:///modules/nfs/nfs.sysconfig", + mode => 0644, + owner => root, + group => root, + notify => Service["nfs"], } service { "nfs": - ensure => running, - enable => true, - hasstatus => true, - require => Package["nfs-utils"], + ensure => running, + enable => true, + hasstatus => true, + require => Package["nfs-utils"], } exec { "exportfs": - command => "exportfs -av", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - refreshonly => true, - require => Service["nfs"], + command => "exportfs -av", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + refreshonly => true, + require => Service["nfs"], } } diff --git a/nginx/manifests/init.pp b/nginx/manifests/init.pp index 6a25bc6..0addb42 100644 --- a/nginx/manifests/init.pp +++ b/nginx/manifests/init.pp @@ -18,8 +18,8 @@ class nginx { } service { "nginx": - enable => true, ensure => running, + enable => true, require => Package["nginx"], } diff --git a/openvpn/manifests/init.pp b/openvpn/manifests/init.pp index 53cfd4c..d99a795 100644 --- a/openvpn/manifests/init.pp +++ b/openvpn/manifests/init.pp @@ -9,7 +9,7 @@ class openvpn::client { service { "openvpn": ensure => running, enable => true, - require => [ Package["openvpn"], + require => [ Package["openvpn"], File["/etc/openvpn/openvpn.conf"], File["/etc/openvpn/ta.key"], File["/etc/openvpn/ca.crt"], ], @@ -30,11 +30,11 @@ class openvpn::client { file { "/etc/openvpn/openvpn.conf": ensure => present, - content => template("openvpn/openvpn.conf.erb"), + content => template("openvpn/openvpn.conf.erb"), mode => 0640, owner => "root", group => "root", - notify => Service["openvpn"], + notify => Service["openvpn"], require => Package["openvpn"], } file { "/etc/openvpn/ta.key": diff --git a/psacct/manifests/init.pp b/psacct/manifests/init.pp index 09ec195..c57fbb8 100644 --- a/psacct/manifests/init.pp +++ b/psacct/manifests/init.pp @@ -31,7 +31,7 @@ class psacct::linux { } service { "psacct": - name => $operatingsystem ? { + name => $operatingsystem ? { ubuntu => "acct", default => "psacct", }, diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp index 88b7884..20a1d9e 100644 --- a/puppet/manifests/init.pp +++ b/puppet/manifests/init.pp @@ -4,7 +4,7 @@ class puppet::client { tag("bootstrap") - + if ! $puppet_server { $puppet_server = "puppet" } @@ -19,15 +19,15 @@ class puppet::client { } case $operatingsystem { - centos,fedora: { - package { "ruby-shadow": - ensure => installed, - } - } + centos,fedora: { + package { "ruby-shadow": + ensure => installed, + } + } 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"], } } @@ -44,7 +44,7 @@ class puppet::client { } } } - + file { "/etc/puppet/puppet.conf": ensure => present, content => template("puppet/puppet.conf.erb"), @@ -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": @@ -299,7 +299,7 @@ class puppet::server::common inherits puppet::client { selinux::manage_fcontext { "${puppet_datadir}(/.*)?": type => "var_lib_t", before => File[$puppet_datadir], - } + } } } diff --git a/python/manifests/init.pp b/python/manifests/init.pp index 09ba3a4..87413cc 100644 --- a/python/manifests/init.pp +++ b/python/manifests/init.pp @@ -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", } diff --git a/rsync/manifests/init.pp b/rsync/manifests/init.pp index 15a010c..6d4124b 100644 --- a/rsync/manifests/init.pp +++ b/rsync/manifests/init.pp @@ -22,5 +22,5 @@ class rsync::run-rsync { group => "root", } } - } + } } diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp index 5aa0e9e..2285fe8 100644 --- a/samba/manifests/init.pp +++ b/samba/manifests/init.pp @@ -3,7 +3,7 @@ class samba::server { package { "samba": - ensure => installed, + ensure => installed, } case $operatingsystem { @@ -58,30 +58,30 @@ class samba::server { } file { "/etc/samba/smb.conf": - ensure => present, - source => [ "puppet:///files/samba/smb.conf.${fqdn}", - "puppet:///files/samba/smb.conf", ], - mode => 0644, - owner => root, - group => $operatingsystem ? { + ensure => present, + source => [ "puppet:///files/samba/smb.conf.${fqdn}", + "puppet:///files/samba/smb.conf", ], + mode => 0644, + owner => root, + group => $operatingsystem ? { openbsd => wheel, default => root, }, - require => Package["samba"], + require => Package["samba"], } file { "/etc/samba/lmhosts": - ensure => present, - source => [ "puppet:///files/samba/lmhosts.${fqdn}", - "puppet:///files/samba/lmhosts", - "puppet:///modules/samba/lmhosts", ], - mode => 0644, - owner => root, - group => $operatingsystem ? { + ensure => present, + source => [ "puppet:///files/samba/lmhosts.${fqdn}", + "puppet:///files/samba/lmhosts", + "puppet:///modules/samba/lmhosts", ], + mode => 0644, + owner => root, + group => $operatingsystem ? { openbsd => wheel, default => root, }, - require => Package["samba"], + require => Package["samba"], } } diff --git a/saslauthd/manifests/init.pp b/saslauthd/manifests/init.pp index 392efbc..e42d806 100644 --- a/saslauthd/manifests/init.pp +++ b/saslauthd/manifests/init.pp @@ -25,7 +25,7 @@ class saslauthd::server { creates => "/etc/sasldb2", require => Package["cyrus-sasl"], } - + } @@ -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": diff --git a/selinux/manifests/init.pp b/selinux/manifests/init.pp index 21eaee1..68b275d 100644 --- a/selinux/manifests/init.pp +++ b/selinux/manifests/init.pp @@ -12,7 +12,7 @@ class selinux { if $kernel != "Linux" { fail("SELinux supported only on Linux systems") } - + if ! $selinux_type { $selinux_type = "permissive" } @@ -22,11 +22,11 @@ class selinux { "disabled": {} default: { fail("Invalid SELinux mode ${selinux_type}") } } - + package { [ "selinux-policy-targeted", "setroubleshoot" ]: ensure => installed, } - + file { "/etc/selinux/config": ensure => present, content => template("selinux/config.erb"), @@ -62,7 +62,7 @@ class selinux { unless => "getenforce | egrep -i '${selinux_type}'", require => File["/etc/selinux/config"], } - + include selinux::tools } diff --git a/sendmail/manifests/init.pp b/sendmail/manifests/init.pp index f0c2f75..56a22d9 100644 --- a/sendmail/manifests/init.pp +++ b/sendmail/manifests/init.pp @@ -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, @@ -68,8 +68,8 @@ class sendmail::client inherits sendmail::common { } exec { "make submit.cf": - path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail", - cwd => $operatingsystem ? { + path => "/bin:/usr/bin:/sbin:/usr/sbin:/etc/mail", + cwd => $operatingsystem ? { "openbsd" => "/usr/share/sendmail/cf", default => "/etc/mail", }, @@ -133,9 +133,11 @@ class sendmail::server inherits sendmail::common { } } - file { "sendmail.mc": name => $operatingsystem ? { - "openbsd" => "/usr/share/sendmail/cf/sendmail.mc", - default => "/etc/mail/sendmail.mc", }, + file { "sendmail.mc": + name => $operatingsystem ? { + "openbsd" => "/usr/share/sendmail/cf/sendmail.mc", + default => "/etc/mail/sendmail.mc", + }, content => template("sendmail/sendmail.mc.erb"), owner => "root", group => $group, @@ -143,21 +145,21 @@ class sendmail::server inherits sendmail::common { notify => Exec["make sendmail.cf"], } - file { "/etc/aliases": + file { "/etc/aliases": ensure => present, - notify => Exec["newaliases"], + notify => Exec["newaliases"], owner => "root", group => $group, mode => 0644, - } + } exec { "make sendmail.cf": - path => "/bin:/usr/bin:/sbin:/usr/sbin", - cwd => $operatingsystem ? { + path => "/bin:/usr/bin:/sbin:/usr/sbin", + cwd => $operatingsystem ? { openbsd => "/usr/share/sendmail/cf", default => "/etc/mail", }, - require => $operatingsystem ? { + require => $operatingsystem ? { openbsd => undef, default => Package["sendmail"], }, @@ -174,11 +176,11 @@ class sendmail::server inherits sendmail::common { default => undef, }, require => Exec["make sendmail.cf"], - notify => Service["sendmail"], + notify => Service["sendmail"], } exec { "newaliases": - path => "/bin:/usr/bin:/sbin:/usr/sbin", + path => "/bin:/usr/bin:/sbin:/usr/sbin", refreshonly => true, } } diff --git a/smolt/manifests/init.pp b/smolt/manifests/init.pp index 3191a80..5404a83 100644 --- a/smolt/manifests/init.pp +++ b/smolt/manifests/init.pp @@ -20,5 +20,5 @@ class smolt::client inherits smolt::package { hasstatus => true, require => Package["smolt"], } - + } diff --git a/ssh/manifests/init.pp b/ssh/manifests/init.pp index 69afa1e..dd2b5a1 100644 --- a/ssh/manifests/init.pp +++ b/ssh/manifests/init.pp @@ -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"], } diff --git a/ssl/manifests/init.pp b/ssl/manifests/init.pp index 0ff0863..7e0fb09 100644 --- a/ssl/manifests/init.pp +++ b/ssl/manifests/init.pp @@ -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, diff --git a/svn/manifests/init.pp b/svn/manifests/init.pp index 5497ca6..4b58b16 100644 --- a/svn/manifests/init.pp +++ b/svn/manifests/init.pp @@ -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}"], } diff --git a/sysctl/manifests/init.pp b/sysctl/manifests/init.pp index f49ffd4..18831fe 100644 --- a/sysctl/manifests/init.pp +++ b/sysctl/manifests/init.pp @@ -17,15 +17,15 @@ define sysctl::set($value) { exec { "sysctl-${name}": - command => "sysctl -w ${name}='${value}'", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - unless => "test \"`sysctl -n ${name}`\" = \"${value}\"", + command => "sysctl -w ${name}='${value}'", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + unless => "test \"`sysctl -n ${name}`\" = \"${value}\"", } exec { "sysctl-${name}-save": - path => "/bin:/usr/bin:/sbin:/usr/sbin", - command => "echo '${name}=${value}' >> /etc/sysctl.conf", - unless => "egrep '^${name}=' /etc/sysctl.conf", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + command => "echo '${name}=${value}' >> /etc/sysctl.conf", + unless => "egrep '^${name}=' /etc/sysctl.conf", } } diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp index c50cf59..dde2166 100644 --- a/syslog/manifests/init.pp +++ b/syslog/manifests/init.pp @@ -84,8 +84,8 @@ class syslog::client::syslogd { if $operatingsystem != "OpenBSD" { package { "syslogd": - name => "sysklogd", ensure => installed, + name => "sysklogd", before => File["/etc/syslog.conf"], } } diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp index d7d89db..9c49f88 100644 --- a/tftp/manifests/init.pp +++ b/tftp/manifests/init.pp @@ -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": @@ -64,8 +64,8 @@ class tftp::server { } if $tftp_datadir { selinux::manage_fcontext { "${tftp_datadir}(/.*)?": - type => "tftpdir_t", - before => File["${tftp_datadir}"], + type => "tftpdir_t", + before => File[$tftp_datadir], } } } diff --git a/time/manifests/init.pp b/time/manifests/init.pp index 10612c7..d69fe9d 100644 --- a/time/manifests/init.pp +++ b/time/manifests/init.pp @@ -5,7 +5,7 @@ class time::server { include inetd::server inetd::service { "time-stream": - ensure => present, + ensure => present, } } @@ -17,24 +17,27 @@ class time::server { class time::zone { file { "/etc/localtime": ensure => present, - mode => 0644, + mode => 0644, source => "/usr/share/zoneinfo/$timezone_set" } case $operatingsystem { centos,redhat: { file { "/etc/sysconfig/clock": - ensure => present, - mode => 0644, + ensure => present, + mode => 0644, content => template("time/sysconfig_clock.erb"), } } ubuntu: { file { "/etc/timezone": - ensure => present, - mode => 0644, + ensure => present, + mode => 0644, content => "$timezone_set\n", } } + default: { + fail("time::zone not supported on ${operatingsystem}") + } } } diff --git a/user/manifests/init.pp b/user/manifests/init.pp index c98c763..2be2db6 100644 --- a/user/manifests/init.pp +++ b/user/manifests/init.pp @@ -12,14 +12,12 @@ class user::system { }, } - case $operatingsystem { - "ubuntu": { - file { "/sbin/nologin": - ensure => link, - target => "/usr/sbin/nologin", - owner => "root", - group => "root", - } + if $operatingsystem == "ubuntu": { + file { "/sbin/nologin": + ensure => link, + target => "/usr/sbin/nologin", + owner => "root", + group => "root", } } @@ -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, } diff --git a/util/manifests/init.pp b/util/manifests/init.pp index ebb74f8..20c01ff 100644 --- a/util/manifests/init.pp +++ b/util/manifests/init.pp @@ -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"], diff --git a/vmware/manifests/guest.pp b/vmware/manifests/guest.pp index 466fa58..0292ca9 100644 --- a/vmware/manifests/guest.pp +++ b/vmware/manifests/guest.pp @@ -4,12 +4,12 @@ class vmware::guest { case $virtual { - vmware: { - case $operatingsystem { - centos: { include vmware::guest::centos } - fedora: { include vmware::guest::fedora } - } - } + vmware: { + case $operatingsystem { + centos: { include vmware::guest::centos } + fedora: { include vmware::guest::fedora } + } + } } } @@ -46,11 +46,11 @@ class vmware::guest::centos { class vmware::guest::fedora { package { "VMwareTools": - ensure => absent, + ensure => absent, } package { "open-vm-tools": - ensure => installed, - require => Package["VMwareTools"], + ensure => installed, + require => Package["VMwareTools"], } } diff --git a/vmware/manifests/player.pp b/vmware/manifests/player.pp index 89e2df4..5e7bc6e 100644 --- a/vmware/manifests/player.pp +++ b/vmware/manifests/player.pp @@ -9,5 +9,5 @@ class vmware::player { vmware::bundle { "VMware-Player": } - + } diff --git a/vmware/manifests/server.pp b/vmware/manifests/server.pp index a4c4939..a41d7bd 100644 --- a/vmware/manifests/server.pp +++ b/vmware/manifests/server.pp @@ -2,50 +2,50 @@ class vmware::server { package { "VMware-server": - ensure => installed, + ensure => installed, } service { "vmware": - ensure => running, - enable => true, - hasstatus => true, - start => "pkill 'vmnet-' ; /sbin/service vmware stop ; rm -f /etc/vmware/not_configured ; /sbin/service vmware start && sleep 5", - stop => "pkill 'vmnet-' ; /sbin/service vmware stop", - require => [ Package["VMware-server"], - Exec["vmware-config.pl"], ], + ensure => running, + enable => true, + hasstatus => true, + start => "pkill 'vmnet-' ; /sbin/service vmware stop ; rm -f /etc/vmware/not_configured ; /sbin/service vmware start && sleep 5", + stop => "pkill 'vmnet-' ; /sbin/service vmware stop", + require => [ Package["VMware-server"], + Exec["vmware-config.pl"], ], } # seems that vmware init script fails if pid files are missing for vmnet # processes, so kill them by force first exec { "vmware-config.pl": - command => "pkill 'vmnet-' ; perl /usr/bin/vmware-config.pl --default EULA_AGREED=yes && rm -f /etc/vmware/not_configured", - path => "/bin:/usr/bin:/sbin:/usr/sbin", + command => "pkill 'vmnet-' ; perl /usr/bin/vmware-config.pl --default EULA_AGREED=yes && rm -f /etc/vmware/not_configured", + path => "/bin:/usr/bin:/sbin:/usr/sbin", environment => [ "PAGER=/bin/cat", ], - unless => "test ! -f /etc/vmware/not_configured -a -f /lib/modules/$kernelrelease/misc/vmci.ko", + unless => "test ! -f /etc/vmware/not_configured -a -f /lib/modules/$kernelrelease/misc/vmci.ko", require => Package["VMware-server"], - notify => Service["vmware"], + notify => Service["vmware"], } if $vmware_serial { - exec { "vmware-set-serial": - command => "/usr/lib/vmware/bin/vmware-vmx --new-sn ${vmware_serial}", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - creates => "/etc/vmware/license.vs.1.0-00", - require => Package["VMware-server"], - before => Exec["vmware-config.pl"], - } + exec { "vmware-set-serial": + command => "/usr/lib/vmware/bin/vmware-vmx --new-sn ${vmware_serial}", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + creates => "/etc/vmware/license.vs.1.0-00", + require => Package["VMware-server"], + before => Exec["vmware-config.pl"], + } } if $vmware_admin_group { file { "/etc/vmware/ssl/rui.key": - ensure => present, - mode => 0640, - owner => root, - group => $vmware_admin_group, - require => [ Service["vmware"], + ensure => present, + mode => 0640, + owner => root, + group => $vmware_admin_group, + require => [ Service["vmware"], Class["puppet::client"], ], - notify => Exec["restart-vmware-mgmt"], + notify => Exec["restart-vmware-mgmt"], } exec { "restart-vmware-mgmt": command => "/etc/init.d/vmware-mgmt restart && sleep 10", @@ -73,21 +73,21 @@ class vmware::server::scripts { include socat::package define vmware::server::scripts::file { - file { "/usr/local/sbin/${name}": - ensure => present, - source => "puppet:///modules/vmware/scripts/${name}", - mode => 0755, - owner => root, - group => root, - } + file { "/usr/local/sbin/${name}": + ensure => present, + source => "puppet:///modules/vmware/scripts/${name}", + mode => 0755, + owner => root, + group => root, + } } file { "/usr/local/lib/vmware.sh": - ensure => present, - source => "puppet:///modules/vmware/scripts/vmware.sh", - mode => 0644, - owner => root, - group => root, + ensure => present, + source => "puppet:///modules/vmware/scripts/vmware.sh", + mode => 0644, + owner => root, + group => root, } vmware::server::scripts::file { "vmware-console": } @@ -112,18 +112,18 @@ class vmware::server::vmfs { include vmware::server file { "/vmfs": - ensure => directory, - mode => 0755, - owner => root, - group => root, - require => Package["VMware-server"], + ensure => directory, + mode => 0755, + owner => root, + group => root, + require => Package["VMware-server"], } file { "/vmfs/volumes": - ensure => directory, - mode => 0755, - owner => root, - group => root, - require => File["/vmfs"], + ensure => directory, + mode => 0755, + owner => root, + group => root, + require => File["/vmfs"], } } @@ -158,61 +158,61 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults") if $type == "auto" { $server = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\1') - if $server == $device { - $fstype = $type - if $device == regsubst($device, '^(/dev/).+$', '\1') { - $mountopts = "bind" - } - } else { - $fstype = "nfs" - $path = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\2') - } + if $server == $device { + $fstype = $type + if $device == regsubst($device, '^(/dev/).+$', '\1') { + $mountopts = "bind" + } + } else { + $fstype = "nfs" + $path = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\2') + } } if !$mountopts { - $mountopts = $options + $mountopts = $options } file { "/vmfs/volumes/${name}": - ensure => directory, - mode => $fstype ? { + ensure => directory, + mode => $fstype ? { nfs => 0755, default => 0775, }, - owner => root, - group => $fstype ? { + owner => root, + group => $fstype ? { nfs => "root", default => $real_vmware_admin_group, }, - require => File["/vmfs/volumes"], + require => File["/vmfs/volumes"], } mount { "/vmfs/volumes/${name}": - ensure => mounted, - device => "${device}", - fstype => "${fstype}", - options => "${mountopts}", - require => File["/vmfs/volumes/${name}"], + ensure => mounted, + device => $device, + fstype => $fstype, + options => $mountopts, + require => File["/vmfs/volumes/${name}"], } exec { "vmware-create-datastore-${name}": - command => $fstype ? { - nfs => "vmware-vim-cmd hostsvc/datastore/nas_create ${name} ${server} ${path} 0", - default => "vmware-vim-cmd hostsvc/datastore/localds_create ${name} /vmfs/volumes/${name}", - }, - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - unless => "vmware-vim-cmd hostsvc/datastore/summary ${name}", - require => [ Mount["/vmfs/volumes/${name}"], - Service["vmware"], ], - notify => Exec["vmware-refresh-datastore-${name}"], + command => $fstype ? { + nfs => "vmware-vim-cmd hostsvc/datastore/nas_create ${name} ${server} ${path} 0", + default => "vmware-vim-cmd hostsvc/datastore/localds_create ${name} /vmfs/volumes/${name}", + }, + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + unless => "vmware-vim-cmd hostsvc/datastore/summary ${name}", + require => [ Mount["/vmfs/volumes/${name}"], + Service["vmware"], ], + notify => Exec["vmware-refresh-datastore-${name}"], } exec { "vmware-refresh-datastore-${name}": - command => "vmware-vim-cmd hostsvc/datastore/refresh ${name}", - path => "/bin:/usr/bin:/sbin:/usr/sbin", - user => root, - refreshonly => true, + command => "vmware-vim-cmd hostsvc/datastore/refresh ${name}", + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => root, + refreshonly => true, } } @@ -229,7 +229,7 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults") # $device: # Physical network device to bridge. # $ensure: -# Set to present to enable bridge and absent to disable it. +# Set to present to enable bridge and absent to disable it. # # === Sample usage # @@ -243,35 +243,35 @@ define vmware::server::bridge($description, $device, $ensure = "present") { $vmnet = regsubst($name, '^vmnet([0-9]+)$', '\1') if $vmnet == $name { - fail("Invalid vmnet device name.") + fail("Invalid vmnet device name.") } service { "${name}-bridge": - ensure => $ensure ? { - "present" => running, - "absent" => stopped, - }, - pattern => "/usr/bin/vmnet-bridge -d .* -n ${vmnet}", - start => "/usr/bin/vmnet-bridge -d /var/run/vmnet-bridge-${vmnet}.pid -n ${vmnet} -i ${device}", - stop => "pkill -f '/usr/bin/vmnet-bridge -d .* -n ${vmnet}'", - provider => base, - require => Exec["vmware-config.pl"], + ensure => $ensure ? { + "present" => running, + "absent" => stopped, + }, + pattern => "/usr/bin/vmnet-bridge -d .* -n ${vmnet}", + start => "/usr/bin/vmnet-bridge -d /var/run/vmnet-bridge-${vmnet}.pid -n ${vmnet} -i ${device}", + stop => "pkill -f '/usr/bin/vmnet-bridge -d .* -n ${vmnet}'", + provider => base, + require => Exec["vmware-config.pl"], } vmware_config { "VNET_${vmnet}_NAME": - ensure => $ensure ? { - absent => absent, - present => "${description}", - }, - require => Exec["vmware-config.pl"], + ensure => $ensure ? { + absent => absent, + present => $description, + }, + require => Exec["vmware-config.pl"], } vmware_config { "VNET_${vmnet}_INTERFACE": - ensure => $ensure ? { - absent => absent, - present => "${device}", - }, - notify => Service["${name}-bridge"], - require => Exec["vmware-config.pl"], + ensure => $ensure ? { + absent => absent, + present => $device, + }, + notify => Service["${name}-bridge"], + require => Exec["vmware-config.pl"], } } diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp index df50e47..d6e343c 100644 --- a/vsroom/manifests/init.pp +++ b/vsroom/manifests/init.pp @@ -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": diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp index 63ee207..87ca53f 100644 --- a/wiki/manifests/init.pp +++ b/wiki/manifests/init.pp @@ -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":