Lint fixes
This commit is contained in:
Ossi Salmi
parent
96fb1bacbc
commit
f70c8572a5
18 changed files with 71 additions and 43 deletions
|
|
@ -1,15 +1,16 @@
|
|||
|
||||
# Install alpine.
|
||||
#
|
||||
class alpine {
|
||||
|
||||
package { "alpine":
|
||||
ensure => installed,
|
||||
}
|
||||
|
||||
if ! $mail_server {
|
||||
$mail_server = "mail.${domain}"
|
||||
if ! $::mail_server {
|
||||
$mail_server = "mail.${::domain}"
|
||||
}
|
||||
if ! $mail_domain {
|
||||
$mail_domain = $domain
|
||||
if ! $::mail_domain {
|
||||
$mail_domain = $::domain
|
||||
}
|
||||
|
||||
file { "/usr/bin/pine":
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
|
||||
# Install and configure autofs service.
|
||||
#
|
||||
class autofs {
|
||||
|
||||
package { "autofs":
|
||||
|
|
|
|||
|
|
@ -1,16 +1,19 @@
|
|||
|
||||
# Prerequisites for Dell tools
|
||||
#
|
||||
class dell::common {
|
||||
|
||||
case $::operatingsystem {
|
||||
"centos", "redhat": {
|
||||
"centos","redhat": {
|
||||
include yum::repo::dell
|
||||
}
|
||||
default: {
|
||||
fail("Dell modules not supported in ${operatingsystem}")
|
||||
fail("Dell modules not supported in ${::operatingsystem}")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
# Tools and services for Dell iDRAC7 management
|
||||
#
|
||||
class dell::idrac7 {
|
||||
|
|
@ -39,4 +42,5 @@ class dell::idrac7 {
|
|||
group => "root",
|
||||
require => Package["srvadmin-idrac7"],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
unless => "test \"`gconftool-2 --direct --config-source xml:readwrite:${xml} --get '${name}'`\" = '${value}'",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ class hastymail($datadir=undef) {
|
|||
include php::mcrypt
|
||||
|
||||
if !$hastymail_package {
|
||||
if $hastymail_package_latest {
|
||||
$hastymail_package = $hastymail_package_latest
|
||||
if $::hastymail_package_latest {
|
||||
$hastymail_package = $::hastymail_package_latest
|
||||
} else {
|
||||
fail("Must define \$hastymail_package or \$hastymail_package_latest")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@
|
|||
class igraph::python {
|
||||
|
||||
case $::operatingsystem {
|
||||
ubuntu: {
|
||||
"ubuntu": {
|
||||
package { "python-igraph":
|
||||
ensure => installed,
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,10 +83,21 @@ class irc::services inherits irc::server {
|
|||
# $ident:
|
||||
# Use ident service. Defaults to false.
|
||||
#
|
||||
define irc::network($desc, $servername, $serverdesc, $port, $sslport,
|
||||
$sslcert="", $operator=["*@127.0.0.1"], $operuser="root",
|
||||
$operpass, $userpass="", $services=false, $servpass="",
|
||||
$ident=false) {
|
||||
define irc::network(
|
||||
$desc,
|
||||
$servername,
|
||||
$serverdesc,
|
||||
$port,
|
||||
$sslport,
|
||||
$operpass,
|
||||
$sslcert="",
|
||||
$operator=["*@127.0.0.1"],
|
||||
$operuser="root",
|
||||
$userpass="",
|
||||
$services=false,
|
||||
$servpass="",
|
||||
$ident=false,
|
||||
) {
|
||||
|
||||
include irc::server
|
||||
|
||||
|
|
@ -124,12 +135,12 @@ define irc::network($desc, $servername, $serverdesc, $port, $sslport,
|
|||
mode => "0600",
|
||||
owner => "irc",
|
||||
group => "irc",
|
||||
source => "${sslcert}",
|
||||
source => $sslcert,
|
||||
require => File["/var/lib/ratbox/${name}"],
|
||||
}
|
||||
} else {
|
||||
ssl::certificate { "/var/lib/ratbox/${name}/ircd.pem":
|
||||
cn => "${servername}",
|
||||
cn => $servername,
|
||||
mode => "0600",
|
||||
owner => "irc",
|
||||
group => "irc",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Add LSB Core system components
|
||||
#
|
||||
class lsb::core {
|
||||
|
|
@ -14,6 +13,9 @@ class lsb::core {
|
|||
"ubuntu": {
|
||||
$pkgname = "lsb-core"
|
||||
}
|
||||
default: {
|
||||
fail("lsb::core not supported on ${::operatingsystem}"}
|
||||
}
|
||||
}
|
||||
|
||||
package { "lsb-core":
|
||||
|
|
@ -42,6 +44,9 @@ class lsb::desktop {
|
|||
"ubuntu": {
|
||||
$pkgname = "lsb-desktop"
|
||||
}
|
||||
default: {
|
||||
fail("lsb::desktop not supported on ${::operatingsystem}"}
|
||||
}
|
||||
}
|
||||
|
||||
package { "lsb-desktop":
|
||||
|
|
@ -50,4 +55,3 @@ class lsb::desktop {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Install Lynx WWW browser
|
||||
#
|
||||
# === Global variables:
|
||||
|
|
@ -8,8 +7,8 @@
|
|||
#
|
||||
class lynx {
|
||||
|
||||
if ! $www_default_url {
|
||||
$www_default_url = "http://www.${domain}"
|
||||
if ! $::www_default_url {
|
||||
$www_default_url = "http://www.${::domain}"
|
||||
}
|
||||
|
||||
if $::operatingsystem != "OpenBSD" {
|
||||
|
|
@ -39,7 +38,7 @@ class lynx {
|
|||
default => "/etc/lynx-site.cfg",
|
||||
},
|
||||
content => template("lynx/lynx-site.cfg.erb"),
|
||||
mode => 0644,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => $::operatingsystem ? {
|
||||
"openbsd" => "wheel",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Deploy motd file to server
|
||||
#
|
||||
class motd {
|
||||
|
|
@ -9,6 +8,7 @@ class motd {
|
|||
ensure => absent,
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
|
||||
file { "/etc/motd":
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
|
||||
# Install mutt.
|
||||
#
|
||||
class mutt {
|
||||
|
||||
package { "mutt":
|
||||
ensure => installed,
|
||||
}
|
||||
|
||||
if ! $mail_server {
|
||||
$mail_server = "mail.${domain}"
|
||||
if ! $::mail_server {
|
||||
$mail_server = "mail.${::domain}"
|
||||
}
|
||||
if ! $mail_domain {
|
||||
$mail_domain = $domain
|
||||
if ! $::mail_domain {
|
||||
$mail_domain = $::domain
|
||||
}
|
||||
|
||||
case $::operatingsystem {
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ class raid::tools::mdadm {
|
|||
#
|
||||
class raid::tools::megacli {
|
||||
|
||||
if ! $raid_megacli_package {
|
||||
if ! $::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}")
|
||||
}
|
||||
|
||||
file { "/usr/local/src/${raid_megacli_package}":
|
||||
file { "/usr/local/src/${::raid_megacli_package}":
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => "puppet:///files/packages/${raid_megacli_package}",
|
||||
source => "puppet:///files/packages/${::raid_megacli_package}",
|
||||
before => Package["MegaCli"],
|
||||
}
|
||||
package { "MegaCli":
|
||||
ensure => latest,
|
||||
provider => "rpm",
|
||||
source => "/usr/local/src/${raid_megacli_package}",
|
||||
source => "/usr/local/src/${::raid_megacli_package}",
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class sasl::client {
|
|||
},
|
||||
}
|
||||
|
||||
if $kerberos_realm and $::operatingsystem != "OpenBSD" {
|
||||
if $::kerberos_realm and $::operatingsystem != "OpenBSD" {
|
||||
package { "cyrus-sasl-gssapi":
|
||||
ensure => installed,
|
||||
name => $::operatingsystem ? {
|
||||
|
|
@ -73,6 +73,7 @@ class sasl::saslauthd {
|
|||
notify => Service["saslauthd"],
|
||||
}
|
||||
}
|
||||
default: { )
|
||||
}
|
||||
|
||||
file { "/etc/saslauthd.conf":
|
||||
|
|
@ -111,6 +112,7 @@ class sasl::saslauthd {
|
|||
notify => Service["saslauthd"],
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
}
|
||||
default: {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#
|
||||
class selinux {
|
||||
|
||||
if $kernel != "Linux" {
|
||||
if $::kernel != "Linux" {
|
||||
fail("SELinux supported only on Linux systems")
|
||||
}
|
||||
|
||||
|
|
@ -162,7 +162,7 @@ class selinux::restorecond {
|
|||
group => "root",
|
||||
seltype => "selinux_config_t",
|
||||
source => [
|
||||
"puppet:///files/selinux/restorecond.conf.${homename}",
|
||||
"puppet:///files/selinux/restorecond.conf.${::homename}",
|
||||
"puppet:///files/selinux/restorecond.conf",
|
||||
"puppet:///modules/selinux/restorecond.conf",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ class sks($datadir=undef) {
|
|||
notify => Service["sks"],
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
|
||||
file { "/var/lib/sks/www":
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ class ssh::known_hosts {
|
|||
$::ipaddress6,
|
||||
$::ec2_public_ipv4)
|
||||
|
||||
@@sshkey { $homename:
|
||||
@@sshkey { $::homename:
|
||||
ensure => present,
|
||||
type => rsa,
|
||||
key => $sshrsakey,
|
||||
key => $::sshrsakey,
|
||||
host_aliases => $aliases,
|
||||
require => File["/etc/ssh/ssh_known_hosts"],
|
||||
}
|
||||
|
|
@ -161,6 +161,7 @@ class ssh::disable inherits ssh::server {
|
|||
before => Service["sshd"],
|
||||
}
|
||||
}
|
||||
default: { }
|
||||
}
|
||||
|
||||
Service["sshd"] {
|
||||
|
|
|
|||
|
|
@ -37,13 +37,14 @@ class sudo {
|
|||
|
||||
}
|
||||
|
||||
|
||||
# Install fake sudo
|
||||
#
|
||||
class sudo::fake {
|
||||
|
||||
file { "/usr/bin/sudo":
|
||||
ensure => present,
|
||||
mode => 0555,
|
||||
mode => "0555",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => "puppet:///modules/sudo/fakesudo",
|
||||
|
|
@ -51,6 +52,7 @@ class sudo::fake {
|
|||
|
||||
}
|
||||
|
||||
|
||||
# Add sudoer.
|
||||
#
|
||||
# === Parameters
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ class svn {
|
|||
}
|
||||
|
||||
file { "/etc/subversion/servers":
|
||||
ensure => $http_proxy ? {
|
||||
ensure => $::http_proxy ? {
|
||||
"" => absent,
|
||||
default => present,
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue