Arrows according to Puppet style guide

jorritfolmer · Apr 21, 2017 · 41f8514 · 41f8514
1 parent da8545d
commit 41f8514
Show file tree

Hide file tree

Showing 15 changed files with 96 additions and 96 deletions.
diff --git a/manifests/authentication.pp b/manifests/authentication.pp
@@ -52,17 +52,17 @@
         recurse => true,
         purge   => true,
         force   => true,
-      } ->
-      file { [
+      }
+      -> file { [
         "${splunk_home}/etc/apps/${splunk_app_name}_saml_base",
         "${splunk_home}/etc/apps/${splunk_app_name}_saml_base/${splunk_app_precedence_dir}",
         "${splunk_home}/etc/apps/${splunk_app_name}_saml_base/metadata",]:
         ensure => directory,
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_saml_base/${splunk_app_precedence_dir}/authentication.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_saml_base/${splunk_app_precedence_dir}/authentication.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
@@ -78,17 +78,17 @@
         recurse => true,
         purge   => true,
         force   => true,
-      } ->
-      file { [
+      }
+      -> file { [
         "${splunk_home}/etc/apps/${splunk_app_name}_ldap_base",
         "${splunk_home}/etc/apps/${splunk_app_name}_ldap_base/${splunk_app_precedence_dir}",
         "${splunk_home}/etc/apps/${splunk_app_name}_ldap_base/metadata",]:
         ensure => directory,
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_ldap_base/${splunk_app_precedence_dir}/authentication.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_ldap_base/${splunk_app_precedence_dir}/authentication.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,

diff --git a/manifests/certs/s2s.pp b/manifests/certs/s2s.pp
@@ -15,8 +15,8 @@
     group   => $splunk_os_user,
     mode    => '0700',
     recurse => true,
-  } ->
-  exec { 'openssl dhparam':
+  }
+  -> exec { 'openssl dhparam':
     command   => "openssl dhparam -outform PEM -out ${splunk_home}/etc/auth/certs/dhparam.pem ${dhparamsize}",
     path      => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
     creates   => [
@@ -35,8 +35,8 @@
       creates => [ "${splunk_home}/etc/auth/${sslrootcapath}", ],
       require => File["${splunk_home}/etc/auth/certs"],
       onlyif  => '/usr/bin/test -e /etc/puppet/ssl/certs/ca.pem'
-    } ->
-    exec { 'openssl s2s 1 opensource puppet':
+    }
+    -> exec { 'openssl s2s 1 opensource puppet':
       command => "cat /etc/puppet/ssl/private_keys/${::fqdn}.pem /etc/puppet/ssl/certs/${::fqdn}.pem > ${splunk_home}/etc/auth/${sslcertpath}",
       path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
       creates => [ "${splunk_home}/etc/auth/${sslcertpath}", ],
@@ -50,8 +50,8 @@
       creates => [ "${splunk_home}/etc/auth/${sslrootcapath}", ],
       require => File["${splunk_home}/etc/auth/certs"],
       onlyif  => '/usr/bin/test -e /etc/puppetlabs/puppet/ssl/certs/ca.pem'
-    } ->
-    exec { 'openssl s2s 1 commercial puppet':
+    }
+    -> exec { 'openssl s2s 1 commercial puppet':
       command => "cat /etc/puppetlabs/puppet/ssl/private_keys/${::fqdn}.pem /etc/puppetlabs/puppet/ssl/certs/${::fqdn}.pem > ${splunk_home}/etc/auth/${sslcertpath}",
       path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
       creates => [ "${splunk_home}/etc/auth/certs/s2s.pem", ],
@@ -65,8 +65,8 @@
       creates => [ "${splunk_home}/etc/auth/${sslrootcapath}", ],
       require => File["${splunk_home}/etc/auth/certs"],
       onlyif  => '/usr/bin/test -e /var/lib/puppet/ssl/certs/ca.pem'
-    } ->
-    exec { 'openssl s2s 1 redhat puppet':
+    }
+    -> exec { 'openssl s2s 1 redhat puppet':
       command => "cat /var/lib/puppet/ssl/private_keys/${::fqdn}.pem /var/lib/puppet/ssl/certs/${::fqdn}.pem > ${splunk_home}/etc/auth/${sslcertpath}",
       path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
       creates => [ "${splunk_home}/etc/auth/certs/s2s.pem", ],

diff --git a/manifests/deploymentclient.pp b/manifests/deploymentclient.pp
@@ -26,8 +26,8 @@
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/deploymentclient.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/deploymentclient.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -102,26 +102,26 @@
   include splunk::service
 
   # make sure classes are properly ordered and contained
-  anchor { 'splunk_first': } ->
-  Class['splunk::installed'] ->
-  Class['splunk::inputs'] ->
-  Class['splunk::outputs'] ->
-  Class['splunk::certs::s2s'] ->
-  Class['splunk::web'] ->
-  Class['splunk::server::general'] ->
-  Class['splunk::server::ssl'] ->
-  Class['splunk::server::license'] ->
-  Class['splunk::server::kvstore'] ->
-  Class['splunk::server::clustering'] ->
-  Class['splunk::server::shclustering'] ->
-  Class['splunk::server::diskusage'] ->
-  Class['splunk::splunk_launch'] ->
-  Class['splunk::deploymentclient'] ->
-  Class['splunk::distsearch'] ->
-  Class['splunk::passwd'] ->
-  Class['splunk::authentication'] ->
-  Class['splunk::service'] ->
-  splunk::addsearchpeers { $searchpeers: }
+  anchor { 'splunk_first': }
+  -> Class['splunk::installed']
+  -> Class['splunk::inputs']
+  -> Class['splunk::outputs']
+  -> Class['splunk::certs::s2s']
+  -> Class['splunk::web']
+  -> Class['splunk::server::general']
+  -> Class['splunk::server::ssl']
+  -> Class['splunk::server::license']
+  -> Class['splunk::server::kvstore']
+  -> Class['splunk::server::clustering']
+  -> Class['splunk::server::shclustering']
+  -> Class['splunk::server::diskusage']
+  -> Class['splunk::splunk_launch']
+  -> Class['splunk::deploymentclient']
+  -> Class['splunk::distsearch']
+  -> Class['splunk::passwd']
+  -> Class['splunk::authentication']
+  -> Class['splunk::service']
+  -> splunk::addsearchpeers { $searchpeers: }
   anchor { 'splunk_last': }
 }
 

diff --git a/manifests/inputs.pp b/manifests/inputs.pp
@@ -27,8 +27,8 @@
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/inputs.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/inputs.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,

diff --git a/manifests/outputs.pp b/manifests/outputs.pp
@@ -25,8 +25,8 @@
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/outputs.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/outputs.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,

diff --git a/manifests/passwd.pp b/manifests/passwd.pp
@@ -14,13 +14,13 @@
       mode    => '0600',
       content => ':admin:::',
       replace => 'no',
-    } ->
-    exec { 'set admin passwd':
+    }
+    -> exec { 'set admin passwd':
       command => "sed -i -e 's#^:admin:.*$#:admin:${hash}::${fn}:admin:${email}::#g' ${splunk_home}/etc/passwd",
       unless  => "grep -qe '^:admin:${hash}' ${splunk_home}/etc/passwd",
       path    => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
-    } ->
-    file { "${splunk_home}/etc/.ui_login":
+    }
+    -> file { "${splunk_home}/etc/.ui_login":
       ensure  => present,
       owner   => $splunk_os_user,
       mode    => '0600',

diff --git a/manifests/server/clustering.pp b/manifests/server/clustering.pp
@@ -33,8 +33,8 @@
         recurse => true,
         purge   => true,
         force   => true,
-      } ->
-      file { [
+      }
+      -> file { [
         "${splunk_home}/etc/apps/${splunk_app_name}_master_base",
         "${splunk_home}/etc/apps/${splunk_app_name}_master_base/${splunk_app_precedence_dir}",
         "${splunk_home}/etc/apps/${splunk_app_name}_master_base/metadata",
@@ -45,15 +45,15 @@
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
         replace => $splunk_app_replace,
         content => template("splunk/${splunk_app_name}_pass4symmkey_base/local/server.conf"),
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_master_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_master_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
@@ -73,8 +73,8 @@
         recurse => true,
         purge   => true,
         force   => true,
-      } ->
-      file { [
+      }
+      -> file { [
         "${splunk_home}/etc/apps/${splunk_app_name}_slave_base",
         "${splunk_home}/etc/apps/${splunk_app_name}_slave_base/${splunk_app_precedence_dir}",
         "${splunk_home}/etc/apps/${splunk_app_name}_slave_base/metadata",
@@ -85,15 +85,15 @@
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
         replace => $splunk_app_replace,
         content => template("splunk/${splunk_app_name}_pass4symmkey_base/local/server.conf"),
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_slave_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_slave_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
@@ -113,8 +113,8 @@
         recurse => true,
         purge   => true,
         force   => true,
-      } ->
-      file { [
+      }
+      -> file { [
         "${splunk_home}/etc/apps/${splunk_app_name}_searchhead_base",
         "${splunk_home}/etc/apps/${splunk_app_name}_searchhead_base/${splunk_app_precedence_dir}",
         "${splunk_home}/etc/apps/${splunk_app_name}_searchhead_base/metadata",
@@ -125,15 +125,15 @@
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
         replace => $splunk_app_replace,
         content => template("splunk/${splunk_app_name}_pass4symmkey_base/local/server.conf"),
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_searchhead_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_searchhead_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,

diff --git a/manifests/server/diskusage.pp b/manifests/server/diskusage.pp
@@ -24,8 +24,8 @@
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}/server.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}/server.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,

diff --git a/manifests/server/general.pp b/manifests/server/general.pp
@@ -24,8 +24,8 @@
     owner  => $splunk_os_user,
     group  => $splunk_os_user,
     mode   => '0700',
-  } ->
-  file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/server.conf":
+  }
+  -> file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/server.conf":
     ensure  => present,
     owner   => $splunk_os_user,
     group   => $splunk_os_user,

diff --git a/manifests/server/kvstore.pp b/manifests/server/kvstore.pp
@@ -14,16 +14,16 @@
       recurse => true,
       purge   => true,
       force   => true,
-    } ->
-    file { ["${splunk_home}/etc/apps/${splunk_app_name}_disabled",
+    }
+    -> file { ["${splunk_home}/etc/apps/${splunk_app_name}_disabled",
             "${splunk_home}/etc/apps/${splunk_app_name}_disabled/${splunk_app_precedence_dir}",
             "${splunk_home}/etc/apps/${splunk_app_name}_disabled/metadata",]:
       ensure => directory,
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}_disabled/${splunk_app_precedence_dir}/server.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}_disabled/${splunk_app_precedence_dir}/server.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,
@@ -37,16 +37,16 @@
       recurse => true,
       purge   => true,
       force   => true,
-    } ->
-    file { ["${splunk_home}/etc/apps/${splunk_app_name}_base",
+    }
+    -> file { ["${splunk_home}/etc/apps/${splunk_app_name}_base",
             "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}",
             "${splunk_home}/etc/apps/${splunk_app_name}_base/metadata",]:
       ensure => directory,
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}/server.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}/server.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,

diff --git a/manifests/server/license.pp b/manifests/server/license.pp
@@ -22,8 +22,8 @@
       owner  => $splunk_os_user,
       group  => $splunk_os_user,
       mode   => '0700',
-    } ->
-    file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/server.conf":
+    }
+    -> file { "${splunk_home}/etc/apps/${splunk_app_name}/${splunk_app_precedence_dir}/server.conf":
       ensure  => present,
       owner   => $splunk_os_user,
       group   => $splunk_os_user,

diff --git a/manifests/server/shclustering.pp b/manifests/server/shclustering.pp
@@ -31,25 +31,25 @@
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
         replace => $splunk_app_replace,
         content => template("splunk/${splunk_app_name}_pass4symmkey_base/local/server.conf"),
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,
         replace => $splunk_app_replace,
         content => template("splunk/${splunk_app_name}_base/local/server.conf"),
-      } ->
+      }
       # unfortunately we need to edit etc/system/local/server.conf directly,
       # to prevent the SH Deployer from overwriting server specific config
       # directives like mgmt_uri 
-      augeas { "${splunk_home}/etc/system/local/server.conf/shclustering":
+      -> augeas { "${splunk_home}/etc/system/local/server.conf/shclustering":
         lens    => 'Puppet.lns',
         incl    => "${splunk_home}/etc/system/local/server.conf",
         changes => [
@@ -67,8 +67,8 @@
         owner  => $splunk_os_user,
         group  => $splunk_os_user,
         mode   => '0700',
-      } ->
-      file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
+      }
+      -> file { "${splunk_home}/etc/apps/${splunk_app_name}_pass4symmkey_base/${splunk_app_precedence_dir}/server.conf":
         ensure  => present,
         owner   => $splunk_os_user,
         group   => $splunk_os_user,