From 0cc74ab15fb5ed15bff11fa4cc1f473c8bf7d85d Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 11 May 2011 10:16:21 -0400
Subject: bulk formatting standardization fixes

---
 manifests/base.pp           |  9 ++++----
 manifests/daemon.pp         | 22 +++++++++---------
 manifests/daemon/base.pp    | 56 ++++++++++++++++++++++-----------------------
 manifests/daemon/centos.pp  | 28 +++++++++++------------
 manifests/daemon/disable.pp |  2 +-
 manifests/daemon/vhosts.pp  | 15 ++++++------
 manifests/debian.pp         |  7 +++---
 manifests/init.pp           | 14 ++++++------
 manifests/svn.pp            | 11 +++++----
 manifests/web.pp            |  7 +++---
 manifests/web/absent.pp     |  7 +++---
 manifests/web/lighttpd.pp   |  8 +++----
 12 files changed, 96 insertions(+), 90 deletions(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index 51140b6..e618839 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,6 +1,7 @@
 class git::base {
-    package { 'git':
-        ensure => present,
-        alias => 'git',
-    }
+
+  package { 'git':
+    ensure => present,
+    alias => 'git',
+  }
 }
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 48bcf7c..95840bd 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,17 +1,17 @@
 class git::daemon {
 
-    include git
+  include git
 
-    case $operatingsystem {
-        debian: { include git::daemon::debian }
-        centos: { include git::daemon::centos }
-    }
+  case $operatingsystem {
+    debian: { include git::daemon::debian }
+    centos: { include git::daemon::centos }
+  }
 
-    if $use_shorewall {
-      include shorewall::rules::gitdaemon
-    }
+  if $use_shorewall {
+    include shorewall::rules::gitdaemon
+  }
 
-    if $use_nagios {
-      nagios::service { "git-daemon": check_command => "check_git!${fqdn}"; }
-    }
+  if $use_nagios {
+    nagios::service { "git-daemon": check_command => "check_git!${fqdn}"; }
+  }
 }
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp
index 5632950..0b48b21 100644
--- a/manifests/daemon/base.pp
+++ b/manifests/daemon/base.pp
@@ -1,31 +1,31 @@
 class git::daemon::base {
 
-    file { 'git-daemon_initscript':
-        source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon",
-                    "puppet://$server/modules/site-git/init.d/${operatingsystem}/git-daemon",
-                    "puppet://$server/modules/site-git/init.d/git-daemon",
-                    "puppet://$server/modules/git/init.d/${operatingsystem}/git-daemon",
-                    "puppet://$server/modules/git/init.d/git-daemon" ],
-        require => Package['git'],
-        path => "/etc/init.d/git-daemon",
-        owner => root, group => 0, mode => 0755;
-    }
-    
-    file { 'git-daemon_config':
-        source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon",
-                    "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon",
-                    "puppet://$server/modules/site-git/config/git-daemon",
-                    "puppet://$server/modules/git/config/${operatingsystem}/git-daemon",
-                    "puppet://$server/modules/git/config/git-daemon" ],
-        require => Package['git'],
-        path => "/etc/default/git-daemon",
-        owner => root, group => 0, mode => 0644;
-    }
-    
-    service { 'git-daemon':
-        ensure => running,
-        enable => true,
-        hasstatus => true,
-        require => [ File['git-daemon_initscript'], File['git-daemon_config'] ],
-    }
+  file { 'git-daemon_initscript':
+    source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon",
+                "puppet://$server/modules/site-git/init.d/${operatingsystem}/git-daemon",
+                "puppet://$server/modules/site-git/init.d/git-daemon",
+                "puppet://$server/modules/git/init.d/${operatingsystem}/git-daemon",
+                "puppet://$server/modules/git/init.d/git-daemon" ],
+    require => Package['git'],
+    path => "/etc/init.d/git-daemon",
+    owner => root, group => 0, mode => 0755;
+  }
+  
+  file { 'git-daemon_config':
+    source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon",
+                "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon",
+                "puppet://$server/modules/site-git/config/git-daemon",
+                "puppet://$server/modules/git/config/${operatingsystem}/git-daemon",
+                "puppet://$server/modules/git/config/git-daemon" ],
+    require => Package['git'],
+    path => "/etc/default/git-daemon",
+    owner => root, group => 0, mode => 0644;
+  }
+  
+  service { 'git-daemon':
+    ensure => running,
+    enable => true,
+    hasstatus => true,
+    require => [ File['git-daemon_initscript'], File['git-daemon_config'] ],
+  }
 }
diff --git a/manifests/daemon/centos.pp b/manifests/daemon/centos.pp
index 270685a..e276259 100644
--- a/manifests/daemon/centos.pp
+++ b/manifests/daemon/centos.pp
@@ -1,19 +1,19 @@
 class git::daemon::centos inherits git::daemon::base {
 
-    package { 'git-daemon':
-        ensure => installed,
-        require => Package['git'],
-        alias => 'git-daemon',
-    }
-    
-    File['git-daemon_initscript'] {
-        path => '/etc/init.d/git-daemon',
-        require +> Package['git-daemon'],
-    }
+  package { 'git-daemon':
+    ensure => installed,
+    require => Package['git'],
+    alias => 'git-daemon',
+  }
+  
+  File['git-daemon_initscript'] {
+    path => '/etc/init.d/git-daemon',
+    require +> Package['git-daemon'],
+  }
 
-    File['git-daemon_config'] {
-        path => '/etc/init.d/git-daemon',
-        require +> Package['git-daemon'],
-    }
+  File['git-daemon_config'] {
+    path => '/etc/init.d/git-daemon',
+    require +> Package['git-daemon'],
+  }
 
 }
diff --git a/manifests/daemon/disable.pp b/manifests/daemon/disable.pp
index 958e6fe..057cc88 100644
--- a/manifests/daemon/disable.pp
+++ b/manifests/daemon/disable.pp
@@ -2,7 +2,7 @@ class git::daemon::disable inherits git::daemon::base {
 
   if defined(Package['git-daemon']) {
     Package['git-daemon'] {
-        ensure => absent,
+      ensure => absent,
     }
   }
 
diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp
index d627df1..b568b65 100644
--- a/manifests/daemon/vhosts.pp
+++ b/manifests/daemon/vhosts.pp
@@ -1,9 +1,10 @@
 class git::daemon::vhosts inherits git::daemon {
-    File['git-daemon_config']{
-        source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon.vhosts",
-                    "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon.vhosts",
-                    "puppet://$server/modules/site-git/config/git-daemon.vhosts",
-                    "puppet://$server/modules/git/config/${operatingsystem}/git-daemon.vhosts",
-                    "puppet://$server/modules/git/config/git-daemon.vhosts" ],
-    }
+
+  File['git-daemon_config']{
+    source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon.vhosts",
+                "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon.vhosts",
+                "puppet://$server/modules/site-git/config/git-daemon.vhosts",
+                "puppet://$server/modules/git/config/${operatingsystem}/git-daemon.vhosts",
+                "puppet://$server/modules/git/config/git-daemon.vhosts" ],
+  }
 }
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 8eaa778..2e63d69 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,5 +1,6 @@
 class git::debian inherits git::base {
-    Package['git'] {
-        name => 'git-core',
-    }
+
+  Package['git'] {
+    name => 'git-core',
+  }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 3afce8d..4693af7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,13 +13,13 @@
 
 class git {
 
-    case $operatingsystem {
-        debian: { include git::debian }
-        centos: { include git::centos }
-    }
+  case $operatingsystem {
+    debian: { include git::debian }
+    centos: { include git::centos }
+  }
 
-    if $use_shorewall {
-        include shorewall::rules::out::git
-    }
+  if $use_shorewall {
+    include shorewall::rules::out::git
+  }
 
 }
diff --git a/manifests/svn.pp b/manifests/svn.pp
index b70acfd..ea93474 100644
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -1,9 +1,10 @@
 # manifests/svn.pp
 
 class git::svn {
-    include ::git
-    include subversion
-    package{'git-svn':
-        require => [ Package['git'], Package['subversion'] ],
-    }
+  include ::git
+  include subversion
+
+  package { 'git-svn':
+    require => [ Package['git'], Package['subversion'] ],
+  }
 }
diff --git a/manifests/web.pp b/manifests/web.pp
index 73ed8f6..8679e29 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -1,15 +1,16 @@
 class git::web {
   include git
-  package{'gitweb':
+
+  package { 'gitweb':
     ensure => present,
     require => Package['git'],
   }
 
-  file{'/etc/gitweb.d':
+  file { '/etc/gitweb.d':
     ensure => directory,
     owner => root, group => 0, mode => 0755;
   }
-  file{'/etc/gitweb.conf':
+  file { '/etc/gitweb.conf':
     source => [ "puppet:///modules/site-git/web/${fqdn}/gitweb.conf",
                 "puppet:///modules/site-git/web/gitweb.conf",
                 "puppet:///modules/git/web/gitweb.conf" ],
diff --git a/manifests/web/absent.pp b/manifests/web/absent.pp
index 5ba6e06..4d0dba3 100644
--- a/manifests/web/absent.pp
+++ b/manifests/web/absent.pp
@@ -1,15 +1,16 @@
 class git::web::absent {
-  package{'gitweb':
+
+  package { 'gitweb':
     ensure => absent,
   } 
 
-  file{'/etc/gitweb.d':
+  file { '/etc/gitweb.d':
     ensure => absent,
     purge => true,
     force => true,
     recurse => true,
   } 
-  file{'/etc/gitweb.conf':
+  file { '/etc/gitweb.conf':
     ensure => absent,
   } 
 }
diff --git a/manifests/web/lighttpd.pp b/manifests/web/lighttpd.pp
index 9534c60..980e23c 100644
--- a/manifests/web/lighttpd.pp
+++ b/manifests/web/lighttpd.pp
@@ -1,7 +1,7 @@
 class git::web::lighttpd {
-    include ::lighttpd 
+  include ::lighttpd 
 
-    lighttpd::config::file{'lighttpd-gitweb':
-        content => 'global { server.modules += ("mod_rewrite", "mod_redirect", "mod_alias", "mod_setenv", "mod_cgi" ) }',
-    }
+  lighttpd::config::file{'lighttpd-gitweb':
+    content => 'global { server.modules += ("mod_rewrite", "mod_redirect", "mod_alias", "mod_setenv", "mod_cgi" ) }',
+  }
 }
-- 
cgit v1.2.3