From bfb661b0e1b0cb63de32c4163b7cd07c300883b9 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Sat, 3 Aug 2013 00:10:27 +0300 Subject: [PATCH] Clean tabs and trailing whitespace from manifests --- bacula/manifests/init.pp | 4 ++-- cyrus/manifests/init.pp | 16 +++++++++------- flexlm/manifests/init.pp | 4 ++-- nagios/manifests/target.pp | 2 +- puppet/manifests/init.pp | 2 +- samba/manifests/init.pp | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/bacula/manifests/init.pp b/bacula/manifests/init.pp index ac7aef8..6a87fa6 100644 --- a/bacula/manifests/init.pp +++ b/bacula/manifests/init.pp @@ -221,7 +221,7 @@ class bacula::director($password=undef, selinux::manage_fcontext { "${datadir}(/.*)?": type => "var_spool_t", before => File[$datadir], - } + } if $datadir != "/srv/bacula" { file { "/srv/bacula": ensure => link, @@ -421,7 +421,7 @@ class bacula::storage($password = undef) { # device => "/dev/nst0", # media => "LTO3", # } -# +# define bacula::device($device, $media) { include bacula::storage diff --git a/cyrus/manifests/init.pp b/cyrus/manifests/init.pp index 62fcb3c..d500637 100644 --- a/cyrus/manifests/init.pp +++ b/cyrus/manifests/init.pp @@ -17,7 +17,7 @@ class cyrus { } } - include ssl + include ssl if !$cyrus_key { $postfix_key = "${puppet_ssldir}/private_keys/${homename}.pem" @@ -32,10 +32,11 @@ class cyrus { } package { [ - "cyrus-imapd-2.4", - "cyrus-clients-2.4", - "cyrus-admin-2.4", - "cyrus-doc-2.4", ]: + "cyrus-imapd-2.4", + "cyrus-clients-2.4", + "cyrus-admin-2.4", + "cyrus-doc-2.4", + ]: ensure => present, } @@ -62,7 +63,7 @@ class cyrus { group => "mail", notify => Service["cyrus-imapd"], } - + exec { "usermod-cyrus-ssl-cert": path => "/bin:/usr/bin:/sbin:/usr/sbin", command => "usermod -a -G ssl-cert cyrus", @@ -112,4 +113,5 @@ class cyrus { owner => "cyrus", group => "mail", } -} \ No newline at end of file + +} diff --git a/flexlm/manifests/init.pp b/flexlm/manifests/init.pp index 0f0a6e2..3b0daea 100644 --- a/flexlm/manifests/init.pp +++ b/flexlm/manifests/init.pp @@ -1,6 +1,6 @@ # Install FlexLM license tools -# +# class flexlm::client { if $::kernel == "Linux" { @@ -29,7 +29,7 @@ class flexlm::client { "/usr/local/bin/lmstat", "/usr/local/bin/lmswitch", "/usr/local/bin/lmver", - ]: + ]: ensure => link, target => "lmutil", owner => "root", diff --git a/nagios/manifests/target.pp b/nagios/manifests/target.pp index 3f35edb..eef5eaa 100644 --- a/nagios/manifests/target.pp +++ b/nagios/manifests/target.pp @@ -336,7 +336,7 @@ class nagios::target::nrpe inherits nagios::target { # default => "nagios-plugins-disk", # } # } -# +# define nagios::target::nrpe::service($source=undef, $description=undef, $package=undef) { diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp index 23743a9..b0b4b85 100644 --- a/puppet/manifests/init.pp +++ b/puppet/manifests/init.pp @@ -347,7 +347,7 @@ class puppet::server::common inherits puppet::client { require => Package["puppetmaster"], } selinux::manage_fcontext { "/srv/puppet(/.*)?": - type => $seltype, + type => $seltype, before => File["/srv/puppet"], } } diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp index 15c17cc..af74033 100644 --- a/samba/manifests/init.pp +++ b/samba/manifests/init.pp @@ -72,7 +72,7 @@ class samba::server::configs { # Server description. Defaults to "Samba Server Version %v". # $interfaces: # Array of intefaces samba should listen to. See "interfaces" option -# from smb.conf manual page for syntax. Localhost interface is +# from smb.conf manual page for syntax. Localhost interface is # added automatically. Defaults to all active interfaces. # $names: # Array of NetBIOS names that host will be advertised. Defaults to