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

Lint fixes

Browse source
This commit is contained in:
Ossi Salmi 2015-05-04 11:03:26 +03:00
parent 96fb1bacbc
commit f70c8572a5
18 changed files with 71 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
alpine/manifests/init.pp
View file

@ -1,15 +1,16 @@
# Install alpine.
#
class alpine { class alpine {
package { "alpine": package { "alpine":
ensure => installed, ensure => installed,
} }
if ! $mail_server { if ! $::mail_server {
$mail_server = "mail.${domain}" $mail_server = "mail.${::domain}"
} }
if ! $mail_domain { if ! $::mail_domain {
$mail_domain = $domain $mail_domain = $::domain
} }
file { "/usr/bin/pine": file { "/usr/bin/pine":

3
autofs/manifests/init.pp
View file

@ -1,4 +1,5 @@
# Install and configure autofs service.
#
class autofs { class autofs {
package { "autofs": package { "autofs":

10
dell/manifests/init.pp
View file

@ -1,16 +1,19 @@
# Prerequisites for Dell tools
#
class dell::common { class dell::common {
case $::operatingsystem { case $::operatingsystem {
"centos", "redhat": { "centos","redhat": {
include yum::repo::dell include yum::repo::dell
} }
default: { default: {
fail("Dell modules not supported in ${operatingsystem}") fail("Dell modules not supported in ${::operatingsystem}")
} }
} }
} }
# Tools and services for Dell iDRAC7 management # Tools and services for Dell iDRAC7 management
# #
class dell::idrac7 { class dell::idrac7 {
@ -39,4 +42,5 @@ class dell::idrac7 {
group => "root", group => "root",
require => Package["srvadmin-idrac7"], require => Package["srvadmin-idrac7"],
} }
} }

2
gnome/manifests/init.pp
View file

@ -117,7 +117,7 @@ define gnome::gconf($value, $source = "default", $type = "string", $ltype = "")
} }
} }
exec { "gconftool-2 --direct --config-source xml:readwrite:${xml} --type ${type} $param --set '${name}' '${value}'": exec { "gconftool-2 --direct --config-source xml:readwrite:${xml} --type ${type} ${param} --set '${name}' '${value}'":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
unless => "test \"`gconftool-2 --direct --config-source xml:readwrite:${xml} --get '${name}'`\" = '${value}'", unless => "test \"`gconftool-2 --direct --config-source xml:readwrite:${xml} --get '${name}'`\" = '${value}'",
} }

4
hastymail/manifests/init.pp
View file

@ -13,8 +13,8 @@ class hastymail($datadir=undef) {
include php::mcrypt include php::mcrypt
if !$hastymail_package { if !$hastymail_package {
if $hastymail_package_latest { if $::hastymail_package_latest {
$hastymail_package = $hastymail_package_latest $hastymail_package = $::hastymail_package_latest
} else { } else {
fail("Must define \$hastymail_package or \$hastymail_package_latest") fail("Must define \$hastymail_package or \$hastymail_package_latest")
} }

3
igraph/manifests/init.pp
View file

@ -3,11 +3,12 @@
class igraph::python { class igraph::python {
case $::operatingsystem { case $::operatingsystem {
ubuntu: { "ubuntu": {
package { "python-igraph": package { "python-igraph":
ensure => installed, ensure => installed,
} }
} }
default: { }
} }
} }

23
irc/manifests/init.pp
View file

@ -83,10 +83,21 @@ class irc::services inherits irc::server {
# $ident: # $ident:
# Use ident service. Defaults to false. # Use ident service. Defaults to false.
# #
define irc::network($desc, $servername, $serverdesc, $port, $sslport, define irc::network(
$sslcert="", $operator=["*@127.0.0.1"], $operuser="root", $desc,
$operpass, $userpass="", $services=false, $servpass="", $servername,
$ident=false) { $serverdesc,
$port,
$sslport,
$operpass,
$sslcert="",
$operator=["*@127.0.0.1"],
$operuser="root",
$userpass="",
$services=false,
$servpass="",
$ident=false,
) {
include irc::server include irc::server
@ -124,12 +135,12 @@ define irc::network($desc, $servername, $serverdesc, $port, $sslport,
mode => "0600", mode => "0600",
owner => "irc", owner => "irc",
group => "irc", group => "irc",
source => "${sslcert}", source => $sslcert,
require => File["/var/lib/ratbox/${name}"], require => File["/var/lib/ratbox/${name}"],
} }
} else { } else {
ssl::certificate { "/var/lib/ratbox/${name}/ircd.pem": ssl::certificate { "/var/lib/ratbox/${name}/ircd.pem":
cn => "${servername}", cn => $servername,
mode => "0600", mode => "0600",
owner => "irc", owner => "irc",
group => "irc", group => "irc",

8
lsb/manifests/init.pp
View file

@ -1,4 +1,3 @@
# Add LSB Core system components # Add LSB Core system components
# #
class lsb::core { class lsb::core {
@ -14,6 +13,9 @@ class lsb::core {
"ubuntu": { "ubuntu": {
$pkgname = "lsb-core" $pkgname = "lsb-core"
} }
default: {
fail("lsb::core not supported on ${::operatingsystem}"}
}
} }
package { "lsb-core": package { "lsb-core":
@ -42,6 +44,9 @@ class lsb::desktop {
"ubuntu": { "ubuntu": {
$pkgname = "lsb-desktop" $pkgname = "lsb-desktop"
} }
default: {
fail("lsb::desktop not supported on ${::operatingsystem}"}
}
} }
package { "lsb-desktop": package { "lsb-desktop":
@ -50,4 +55,3 @@ class lsb::desktop {
} }
} }

7
lynx/manifests/init.pp
View file

@ -1,4 +1,3 @@
# Install Lynx WWW browser # Install Lynx WWW browser
# #
# === Global variables: # === Global variables:
@ -8,8 +7,8 @@
# #
class lynx { class lynx {
if ! $www_default_url { if ! $::www_default_url {
$www_default_url = "http://www.${domain}" $www_default_url = "http://www.${::domain}"
} }
if $::operatingsystem != "OpenBSD" { if $::operatingsystem != "OpenBSD" {
@ -39,7 +38,7 @@ class lynx {
default => "/etc/lynx-site.cfg", default => "/etc/lynx-site.cfg",
}, },
content => template("lynx/lynx-site.cfg.erb"), content => template("lynx/lynx-site.cfg.erb"),
mode => 0644, mode => "0644",
owner => "root", owner => "root",
group => $::operatingsystem ? { group => $::operatingsystem ? {
"openbsd" => "wheel", "openbsd" => "wheel",

2
motd/manifests/init.pp
View file

@ -1,4 +1,3 @@
# Deploy motd file to server # Deploy motd file to server
# #
class motd { class motd {
@ -9,6 +8,7 @@ class motd {
ensure => absent, ensure => absent,
} }
} }
default: { }
} }
file { "/etc/motd": file { "/etc/motd":

11
mutt/manifests/init.pp
View file

@ -1,15 +1,16 @@
# Install mutt.
#
class mutt { class mutt {
package { "mutt": package { "mutt":
ensure => installed, ensure => installed,
} }
if ! $mail_server { if ! $::mail_server {
$mail_server = "mail.${domain}" $mail_server = "mail.${::domain}"
} }
if ! $mail_domain { if ! $::mail_domain {
$mail_domain = $domain $mail_domain = $::domain
} }
case $::operatingsystem { case $::operatingsystem {

8
raid/manifests/init.pp
View file

@ -94,7 +94,7 @@ class raid::tools::mdadm {
# #
class raid::tools::megacli { class raid::tools::megacli {
if ! $raid_megacli_package { if ! $::raid_megacli_package {
fail("Must define \$raid_megacli_package") fail("Must define \$raid_megacli_package")
} }
@ -102,18 +102,18 @@ class raid::tools::megacli {
fail("raid::tools::megacli not supported in ${::operatingsystem}") fail("raid::tools::megacli not supported in ${::operatingsystem}")
} }
file { "/usr/local/src/${raid_megacli_package}": file { "/usr/local/src/${::raid_megacli_package}":
ensure => present, ensure => present,
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
source => "puppet:///files/packages/${raid_megacli_package}", source => "puppet:///files/packages/${::raid_megacli_package}",
before => Package["MegaCli"], before => Package["MegaCli"],
} }
package { "MegaCli": package { "MegaCli":
ensure => latest, ensure => latest,
provider => "rpm", provider => "rpm",
source => "/usr/local/src/${raid_megacli_package}", source => "/usr/local/src/${::raid_megacli_package}",
} }
} }

4
sasl/manifests/init.pp
View file

@ -16,7 +16,7 @@ class sasl::client {
}, },
} }
if $kerberos_realm and $::operatingsystem != "OpenBSD" { if $::kerberos_realm and $::operatingsystem != "OpenBSD" {
package { "cyrus-sasl-gssapi": package { "cyrus-sasl-gssapi":
ensure => installed, ensure => installed,
name => $::operatingsystem ? { name => $::operatingsystem ? {
@ -73,6 +73,7 @@ class sasl::saslauthd {
notify => Service["saslauthd"], notify => Service["saslauthd"],
} }
} }
default: { )
} }
file { "/etc/saslauthd.conf": file { "/etc/saslauthd.conf":
@ -111,6 +112,7 @@ class sasl::saslauthd {
notify => Service["saslauthd"], notify => Service["saslauthd"],
} }
} }
default: { }
} }
} }
default: { default: {

4
selinux/manifests/init.pp
View file

@ -9,7 +9,7 @@
# #
class selinux { class selinux {
if $kernel != "Linux" { if $::kernel != "Linux" {
fail("SELinux supported only on Linux systems") fail("SELinux supported only on Linux systems")
} }
@ -162,7 +162,7 @@ class selinux::restorecond {
group => "root", group => "root",
seltype => "selinux_config_t", seltype => "selinux_config_t",
source => [ source => [
"puppet:///files/selinux/restorecond.conf.${homename}", "puppet:///files/selinux/restorecond.conf.${::homename}",
"puppet:///files/selinux/restorecond.conf", "puppet:///files/selinux/restorecond.conf",
"puppet:///modules/selinux/restorecond.conf", "puppet:///modules/selinux/restorecond.conf",
], ],

1
sks/manifests/init.pp
View file

@ -68,6 +68,7 @@ class sks($datadir=undef) {
notify => Service["sks"], notify => Service["sks"],
} }
} }
default: { }
} }
file { "/var/lib/sks/www": file { "/var/lib/sks/www":

5
ssh/manifests/init.pp
View file

@ -17,10 +17,10 @@ class ssh::known_hosts {
$::ipaddress6, $::ipaddress6,
$::ec2_public_ipv4) $::ec2_public_ipv4)
@@sshkey { $homename: @@sshkey { $::homename:
ensure => present, ensure => present,
type => rsa, type => rsa,
key => $sshrsakey, key => $::sshrsakey,
host_aliases => $aliases, host_aliases => $aliases,
require => File["/etc/ssh/ssh_known_hosts"], require => File["/etc/ssh/ssh_known_hosts"],
} }
@ -161,6 +161,7 @@ class ssh::disable inherits ssh::server {
before => Service["sshd"], before => Service["sshd"],
} }
} }
default: { }
} }
Service["sshd"] { Service["sshd"] {

6
sudo/manifests/init.pp
View file

@ -37,20 +37,22 @@ class sudo {
} }
# Install fake sudo # Install fake sudo
# #
class sudo::fake { class sudo::fake {
file { "/usr/bin/sudo": file { "/usr/bin/sudo":
ensure => present, ensure => present,
mode => 0555, mode => "0555",
owner => "root", owner => "root",
group => "root", group => "root",
source => "puppet:///modules/sudo/fakesudo", source => "puppet:///modules/sudo/fakesudo",
} }
} }
# Add sudoer. # Add sudoer.
# #
# === Parameters # === Parameters

2
svn/manifests/init.pp
View file

@ -7,7 +7,7 @@ class svn {
} }
file { "/etc/subversion/servers": file { "/etc/subversion/servers":
ensure => $http_proxy ? { ensure => $::http_proxy ? {
"" => absent, "" => absent,
default => present, default => present,
}, },