mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-03-27 07:44 am
  • Add Memory
  • Share This Entry

[dw-ops] Tabs to spaces. Whitespace only.

[commit: http://hg.dwscoalition.org/dw-ops/rev/ff1d4de36f5c]

Tabs to spaces. Whitespace only.

Patch by [staff profile] mark.

Files modified:
  • puppet/manifests/serverclass/dreamwidth.pp
  • puppet/manifests/serverclass/nonwebserver.pp
  • puppet/manifests/site.pp
  • puppet/modules/apache2/manifests/init.pp
  • puppet/modules/apt/manifests/default.pp
  • puppet/modules/apt/manifests/dreamwidth.pp
  • puppet/modules/apt/manifests/init.pp
  • puppet/modules/iptables/manifests/init.pp
  • puppet/modules/puppet/manifests/init.pp
--------------------------------------------------------------------------------
diff -r fb957786c7be -r ff1d4de36f5c puppet/manifests/serverclass/dreamwidth.pp
--- a/puppet/manifests/serverclass/dreamwidth.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/manifests/serverclass/dreamwidth.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -18,79 +18,79 @@ class serverclass::dreamwidth {
 
     # Local "dw" user and group
     group { dw:
-	ensure => present,
-	gid => 1000
+        ensure => present,
+        gid => 1000
     }
     user { dw:
-	ensure => present,
-	comment => "Dreamwidth",
-	home => "/home/dw",
-	managehome => true,
-	uid => 1000,
-	gid => "dw",
-	shell => "/bin/bash",
-	require => Group["dw"]
+        ensure => present,
+        comment => "Dreamwidth",
+        home => "/home/dw",
+        managehome => true,
+        uid => 1000,
+        gid => "dw",
+        shell => "/bin/bash",
+        require => Group["dw"]
     }
 
     # Ensure that "dw" user can run sudo
     line { sudo_dw:
-	file => "/etc/sudoers",
-	line => "dw ALL=NOPASSWD: ALL",
-	ensure => present
+        file => "/etc/sudoers",
+        line => "dw ALL=NOPASSWD: ALL",
+        ensure => present
     }
 
     # Packages to install
     # (Apache2 and mpm packages are installed in the apache2 module)
     package {
-	dh-make-perl:;
-	libapache2-mod-perl2:;
-	libapache2-request-perl:;
-	libcaptcha-recaptcha-perl:;
-	libclass-accessor-perl:;
-	libclass-autouse-perl:;
-	libclass-data-inheritable-perl:;
-	libclass-trigger-perl:;
-	libcompress-zlib-perl:;
-	libcrypt-dh-perl:;
-	libdatetime-perl:;
-	libdbd-mysql-perl:;
-	libdbi-perl:;
-	libdigest-hmac-perl:;
-	libdigest-sha1-perl:;
-	libgd-gd2-perl:;
-	libgd-graph-perl:;
-	libgnupg-interface-perl:;
-	libgtop2-dev:;
-	libhtml-parser-perl:;
-	libhtml-tagset-perl:;
-	libhtml-template-perl:;
-	libimage-size-perl:;
-	libio-stringy-perl:;
-	libmail-gnupg-perl:;
-	libmailtools-perl:;
-	libmath-bigint-gmp-perl:;
-	libmd5-perl:;
-	libmime-lite-perl:;
-	libmime-perl:;
-	libnet-dns-perl:;
-	libproc-process-perl:;
-	librpc-xml-perl:;
-	libsoap-lite-perl:;
-	libstring-crc32-perl:;
-	libtext-vcard-perl:;
-	libunicode-maputf8-perl:;
-	liburi-fetch-perl:;
-	liburi-perl:;
-	libwww-perl:;
-	libxml-atom-perl:;
-	libxml-rss-perl:;
-	libxml-simple-perl:;
-	mercurial:;
-	mysql-client:;
-	perlmagick:;
-	puppet:;
-	screen:;
-	subversion:;
-	vim-perl:;
+        dh-make-perl:;
+        libapache2-mod-perl2:;
+        libapache2-request-perl:;
+        libcaptcha-recaptcha-perl:;
+        libclass-accessor-perl:;
+        libclass-autouse-perl:;
+        libclass-data-inheritable-perl:;
+        libclass-trigger-perl:;
+        libcompress-zlib-perl:;
+        libcrypt-dh-perl:;
+        libdatetime-perl:;
+        libdbd-mysql-perl:;
+        libdbi-perl:;
+        libdigest-hmac-perl:;
+        libdigest-sha1-perl:;
+        libgd-gd2-perl:;
+        libgd-graph-perl:;
+        libgnupg-interface-perl:;
+        libgtop2-dev:;
+        libhtml-parser-perl:;
+        libhtml-tagset-perl:;
+        libhtml-template-perl:;
+        libimage-size-perl:;
+        libio-stringy-perl:;
+        libmail-gnupg-perl:;
+        libmailtools-perl:;
+        libmath-bigint-gmp-perl:;
+        libmd5-perl:;
+        libmime-lite-perl:;
+        libmime-perl:;
+        libnet-dns-perl:;
+        libproc-process-perl:;
+        librpc-xml-perl:;
+        libsoap-lite-perl:;
+        libstring-crc32-perl:;
+        libtext-vcard-perl:;
+        libunicode-maputf8-perl:;
+        liburi-fetch-perl:;
+        liburi-perl:;
+        libwww-perl:;
+        libxml-atom-perl:;
+        libxml-rss-perl:;
+        libxml-simple-perl:;
+        mercurial:;
+        mysql-client:;
+        perlmagick:;
+        puppet:;
+        screen:;
+        subversion:;
+        vim-perl:;
     }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/manifests/serverclass/nonwebserver.pp
--- a/puppet/manifests/serverclass/nonwebserver.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/manifests/serverclass/nonwebserver.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -8,9 +8,9 @@ class serverclass::nonwebserver inherits
 class serverclass::nonwebserver inherits serverclass::dreamwidth {
     # make sure Apache is not running
     service { "apache2":
-	ensure => stopped,
-	pattern => "/usr/sbin/apache2",
-	hasstatus => true,
-	hasrestart => true
+        ensure => stopped,
+        pattern => "/usr/sbin/apache2",
+        hasstatus => true,
+        hasrestart => true
     }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/manifests/site.pp
--- a/puppet/manifests/site.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/manifests/site.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -14,24 +14,24 @@
 #  Other standard arguments (require, notify, etc.) can be present
 # Usage:
 #   line { description:
-# 	file => "filename",
-# 	line => "content",
-# 	ensure => {absent,*present*}
+#         file => "filename",
+#         line => "content",
+#         ensure => {absent,*present*}
 #   }
 #
 define line($file, $line, $ensure = 'present') {
     case $ensure {
-	default : { err ( "unknown ensure value '${ensure}'" ) }
-	present: {
- 	    exec { "/bin/echo '${line}' >> '${file}'":
-		unless => "/bin/grep -qFx '${line}' '${file}'"
-	    }
-	}
-	absent: {
-	    exec { "/usr/bin/perl -ni -e 'print if \$_ ne \"${line}\n\";' '${file}'":
-		onlyif => "/bin/grep -qFx '${line}' '${file}'"
-	    }
-	}
+        default : { err ( "unknown ensure value '${ensure}'" ) }
+        present: {
+             exec { "/bin/echo '${line}' >> '${file}'":
+                unless => "/bin/grep -qFx '${line}' '${file}'"
+            }
+        }
+        absent: {
+            exec { "/usr/bin/perl -ni -e 'print if \$_ ne \"${line}\n\";' '${file}'":
+                onlyif => "/bin/grep -qFx '${line}' '${file}'"
+            }
+        }
     }
 }
 ###############################################################################
diff -r fb957786c7be -r ff1d4de36f5c puppet/modules/apache2/manifests/init.pp
--- a/puppet/modules/apache2/manifests/init.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/modules/apache2/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -50,89 +50,89 @@ class apache2 {
       }
     }
   }
-	package { apache2:
-		ensure => installed,
-	  require => Package[apache2_mpm_provider],
-	}
+        package { apache2:
+                ensure => installed,
+          require => Package[apache2_mpm_provider],
+        }
 
-	service { apache2:
-		ensure => running,
-		pattern => "/usr/sbin/apache2",
-		hasrestart => true,
-		require => Package[apache2]
-	}
+        service { apache2:
+                ensure => running,
+                pattern => "/usr/sbin/apache2",
+                hasrestart => true,
+                require => Package[apache2]
+        }
 
   # using checksum => mtime and notify ensures that any changes to this dir 
   # will result in an apache reload
-	file { $apache_conf:
-		ensure => directory, checksum => mtime,
-		mode => 644, owner => root, group => root,
-		require => Package[apache2],
-		notify => Exec["reload-apache2"];
-	}
+        file { $apache_conf:
+                ensure => directory, checksum => mtime,
+                mode => 644, owner => root, group => root,
+                require => Package[apache2],
+                notify => Exec["reload-apache2"];
+        }
 
   # as above
-	file { $apache_includes:
-		ensure => directory, checksum => mtime,
-		mode => 644, owner => root, group => root,
-		require => Package[apache2],
-		notify => Exec["reload-apache2"];
-	}
-	
-	# this overwrites the default distro config with one that just includes
-	# $apache_conf and friends
-	file { "/etc/apache2/apache2.conf":
-	  ensure => present,
-	  mode => 644,
-	  owner => root,
-	  group => root,
-	  source => "puppet://$servername/apache2/apache2.conf",
-	  require => File[$apache_conf],
-	}
+        file { $apache_includes:
+                ensure => directory, checksum => mtime,
+                mode => 644, owner => root, group => root,
+                require => Package[apache2],
+                notify => Exec["reload-apache2"];
+        }
+        
+        # this overwrites the default distro config with one that just includes
+        # $apache_conf and friends
+        file { "/etc/apache2/apache2.conf":
+          ensure => present,
+          mode => 644,
+          owner => root,
+          group => root,
+          source => "puppet://$servername/apache2/apache2.conf",
+          require => File[$apache_conf],
+        }
 
   # nuke the package-provided ports.conf
   file {"/etc/apache2/ports.conf": ensure => absent }
 
   # make sure the default site isn't present.
-	exec { "/usr/sbin/a2dissite default":
-		onlyif => "/usr/bin/test -L /etc/apache2/sites-enabled/000-default",
-		notify => Exec["reload-apache2"],
-	}
+        exec { "/usr/sbin/a2dissite default":
+                onlyif => "/usr/bin/test -L /etc/apache2/sites-enabled/000-default",
+                notify => Exec["reload-apache2"],
+        }
 
-	# Notify this when apache needs a reload. This is only needed when
-	# sites are added or removed, since a full restart then would be
-	# a waste of time. When the module-config changes, a force-reload is
-	# needed.
-	exec { "reload-apache2":
-		command => "/etc/init.d/apache2 reload",
-		refreshonly => true,
-		before => [ Service["apache2"], Exec["force-reload-apache2"] ]
-	}
+        # Notify this when apache needs a reload. This is only needed when
+        # sites are added or removed, since a full restart then would be
+        # a waste of time. When the module-config changes, a force-reload is
+        # needed.
+        exec { "reload-apache2":
+                command => "/etc/init.d/apache2 reload",
+                refreshonly => true,
+                before => [ Service["apache2"], Exec["force-reload-apache2"] ]
+        }
 
-	exec { "force-reload-apache2":
-		command => "/etc/init.d/apache2 force-reload",
-		refreshonly => true,
-		before => Service["apache2"],
-	}
-	
+        exec { "force-reload-apache2":
+                command => "/etc/init.d/apache2 force-reload",
+                refreshonly => true,
+                before => Service["apache2"],
+        }
+        
   # Define an apache2 config snippet. Places all config snippets into
   # /etc/apache2/conf.d, where they will be automatically loaded
-	define config ( $ensure = 'present', $content = '', $order="500") {
-	  $real_content = $content ? { '' => template("apache2/${name}.conf.erb"), 
-	    default => $content,
-	  }
-	  
-	  file { "${apache_conf}/${order}-${name}.conf":
+        define config ( $ensure = 'present', $content = '', $order="500") {
+          $real_content = $content ? { '' => template("apache2/${name}.conf.erb"), 
+            default => $content,
+          }
+          
+          file { "${apache_conf}/${order}-${name}.conf":
       ensure => $ensure,
       content => $content,
       mode => 644,
-  	  owner => root,
-  	  group => root,
-		# given the way File[$apache_conf] is defined, this might lead to 
-		# multiple restarts.  not sure.
-			notify => Exec["reload-apache2"], 
+            owner => root,
+            group => root,
+                # given the way File[$apache_conf] is defined, this might lead to 
+                # multiple restarts.  not sure.
+                        notify => Exec["reload-apache2"], 
     }
-	}
+        }
   
 
   # Define an apache2 site. Place all site configs into
@@ -142,71 +142,71 @@ class apache2 {
   # that aren't part of the default apache2 package. Because of the
   # package dependencies, apache2 will automagically be included.
   define site ( $ensure = 'present', $content = '' ) {
-  	case $ensure {
-  		'present' : {
+          case $ensure {
+                  'present' : {
         apache2::install_site { $name:
           content => $content
         }
-  		}
-  		'installed' : {
+                  }
+                  'installed' : {
         apache2::install_site { $name:
           content => $content
         }
-  		}
-  		'absent' : {
-  			exec { "/usr/sbin/a2dissite $name":
-  				onlyif => "/bin/sh -c '[ -L ${apache_sites}-enabled/$name ] \\
-  							&& [ ${apache_sites}-enabled/$name -ef ${apache_sites}-available/$name ]'",
-  				notify => Exec["reload-apache2"],
-  				require => Package["apache2"],
-  			}
-  		}
-  		default: { err ( "Unknown ensure value: '$ensure'" ) }
-  	}
+                  }
+                  'absent' : {
+                          exec { "/usr/sbin/a2dissite $name":
+                                  onlyif => "/bin/sh -c '[ -L ${apache_sites}-enabled/$name ] \\
+                                                          && [ ${apache_sites}-enabled/$name -ef ${apache_sites}-available/$name ]'",
+                                  notify => Exec["reload-apache2"],
+                                  require => Package["apache2"],
+                          }
+                  }
+                  default: { err ( "Unknown ensure value: '$ensure'" ) }
+          }
   }
 
   # helper method to actually install a site -- called by site()
   define install_site ($content = '' ) {
-	  # first, make sure the site config exists
+          # first, make sure the site config exists
     case $content {
       '': {
         file { "${apache_sites}-available/${name}":
           mode => 644,
-      	  owner => root,
-      	  group => root,
-    	    ensure => present,
-    	    alias => "site-$name",
+                owner => root,
+                group => root,
+                ensure => present,
+                alias => "site-$name",
         }
       }
 
       default: {
-    	  file { "${apache_sites}-available/${name}":
+              file { "${apache_sites}-available/${name}":
           content => $content,
           mode => 644,
-      	  owner => root,
-      	  group => root,
-  	      ensure => present,
-  	      alias => "site-$name",  
+                owner => root,
+                group => root,
+                ensure => present,
+                alias => "site-$name",  
         }        
       }
     }
-	  
-	  # now, enable it.
-		exec { "/usr/sbin/a2ensite $name":
-			unless => "/bin/sh -c '[ -L ${apache_sites}-enabled/$name ] \\
-						&& [ ${apache_sites}-enabled/$name -ef ${apache_sites}-available/$name ]'",
-			notify => Exec["reload-apache2"],
-			require => File["site-$name"],
-		}
-	}
+          
+          # now, enable it.
+                exec { "/usr/sbin/a2ensite $name":
+                        unless => "/bin/sh -c '[ -L ${apache_sites}-enabled/$name ] \\
+                                                && [ ${apache_sites}-enabled/$name -ef ${apache_sites}-available/$name ]'",
+                        notify => Exec["reload-apache2"],
+                        require => File["site-$name"],
+                }
+        }
 
   # Define a site config fragment
   define site_include ( $ensure = 'present', $content = '' ) {
-	  file { "${apache_includes}/${name}.inc":
+          file { "${apache_includes}/${name}.inc":
       content => $content,
       mode => 644,
-  	  owner => root,
-  	  group => root,
+            owner => root,
+            group => root,
       ensure => $ensure,
       require => File[$apache_includes],
     }    
@@ -223,22 +223,22 @@ class apache2 {
   # within modules (see puppet trac ticket #803), the unless/onlyif clauses
   # below should get rewritten to use custom facter facts
   define module ( $ensure = 'present') {
-  	case $ensure {
-  		'present' : {
-  			exec { "/usr/sbin/a2enmod $name":
-  				unless => "/bin/sh -c '[ -L ${apache_mods}-enabled/${name}.load ] \\
-  					&& [ ${apache_mods}-enabled/${name}.load -ef ${apache_mods}-available/${name}.load ]'",
-  				notify => Exec["force-reload-apache2"],
-  			}
-  		}
-  		'absent': {
-  			exec { "/usr/sbin/a2dismod $name":
-  				onlyif => "/bin/sh -c '[ -L ${apache_mods}-enabled/${name}.load ] \\
-  					&& [ ${apache_mods}-enabled/${name}.load -ef ${apache_mods}-available/${name}.load ]'",
-  				notify => Exec["force-reload-apache2"],
-  			}
-  		}
-  		default: { err ( "Unknown ensure value: '$ensure'" ) }
-  	}
+          case $ensure {
+                  'present' : {
+                          exec { "/usr/sbin/a2enmod $name":
+                                  unless => "/bin/sh -c '[ -L ${apache_mods}-enabled/${name}.load ] \\
+                                          && [ ${apache_mods}-enabled/${name}.load -ef ${apache_mods}-available/${name}.load ]'",
+                                  notify => Exec["force-reload-apache2"],
+                          }
+                  }
+                  'absent': {
+                          exec { "/usr/sbin/a2dismod $name":
+                                  onlyif => "/bin/sh -c '[ -L ${apache_mods}-enabled/${name}.load ] \\
+                                          && [ ${apache_mods}-enabled/${name}.load -ef ${apache_mods}-available/${name}.load ]'",
+                                  notify => Exec["force-reload-apache2"],
+                          }
+                  }
+                  default: { err ( "Unknown ensure value: '$ensure'" ) }
+          }
   }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/modules/apt/manifests/default.pp
--- a/puppet/modules/apt/manifests/default.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/modules/apt/manifests/default.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -6,8 +6,8 @@
 
 class apt::default inherits apt {
     apt::sources { "default":
-	ensure => present,
-	host => 'us.archive.ubuntu.com',
-	release => 'intrepid'
+        ensure => present,
+        host => 'us.archive.ubuntu.com',
+        release => 'intrepid'
     }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/modules/apt/manifests/dreamwidth.pp
--- a/puppet/modules/apt/manifests/dreamwidth.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/modules/apt/manifests/dreamwidth.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -8,9 +8,9 @@
 
 class apt::dreamwidth inherits apt {
     apt::sources { "dreamwidth":
-	ensure => present,
-	host => 'dfw-admin01',
-	port => '9999',
-	release => 'intrepid'
+        ensure => present,
+        host => 'dfw-admin01',
+        port => '9999',
+        release => 'intrepid'
     }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/modules/apt/manifests/init.pp
--- a/puppet/modules/apt/manifests/init.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/modules/apt/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -7,30 +7,30 @@
 
 class apt {
     define sources (
-	$ensure = 'present',
-	$host = 'us.archive.ubuntu.com',
-	$port = '',
-	$release,
-	$content = ''
+        $ensure = 'present',
+        $host = 'us.archive.ubuntu.com',
+        $port = '',
+        $release,
+        $content = ''
     ) {
-	$apt_uri = $port ? {
-	    '' => $host,
-	    default => "$host:$port"
-	}
+        $apt_uri = $port ? {
+            '' => $host,
+            default => "$host:$port"
+        }
 
-	$ubuntu_release = $release
+        $ubuntu_release = $release
 
-	$real_content = $content ? {
-	    '' => template ("apt/$name.erb"),
-	    default => $content
-	}
+        $real_content = $content ? {
+            '' => template ("apt/$name.erb"),
+            default => $content
+        }
 
-	file { "/etc/apt/sources.list":
-	    ensure => $ensure,
-	    content => $real_content,
-	    mode => 444,
-	    owner => root,
-	    group => root
-	}
+        file { "/etc/apt/sources.list":
+            ensure => $ensure,
+            content => $real_content,
+            mode => 444,
+            owner => root,
+            group => root
+        }
     }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/modules/iptables/manifests/init.pp
--- a/puppet/modules/iptables/manifests/init.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/modules/iptables/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -19,35 +19,35 @@ class iptables {
 class iptables {
     # ensure that the iptables network initialization script is present
     file { "/etc/network/if-pre-up.d/iptables":
-	ensure => present,
-	mode => 755,
-	owner => root,
-	group => root,
-	source => "puppet://$servername/iptables/iptables"
+        ensure => present,
+        mode => 755,
+        owner => root,
+        group => root,
+        source => "puppet://$servername/iptables/iptables"
     }
 
     # run the iptables-restore program to reload the rules
     # only run this when requested (refreshonly)
     exec { "iptables-restore":
-	command => "/sbin/iptables-restore < /etc/iptables.up.rules",
-	refreshonly => true
+        command => "/sbin/iptables-restore < /etc/iptables.up.rules",
+        refreshonly => true
     }
 
     # Load the iptables rules, write the file, and notify the iptables-restore
     # exec to reload the rules
     define rules ( $ensure = 'present', $content = '' ) {
-	$real_content = $content ? {
-		'' => template ("iptables/${name}.erb"),
-		default => $content
-	}
+        $real_content = $content ? {
+                '' => template ("iptables/${name}.erb"),
+                default => $content
+        }
 
-	file { "/etc/iptables.up.rules":
-	    ensure => $ensure,
-	    content => $real_content,
-	    mode => 444,
-	    owner => root,
-	    group => root,
-	    notify => Exec["iptables-restore"]
-	}
+        file { "/etc/iptables.up.rules":
+            ensure => $ensure,
+            content => $real_content,
+            mode => 444,
+            owner => root,
+            group => root,
+            notify => Exec["iptables-restore"]
+        }
     }
 }
diff -r fb957786c7be -r ff1d4de36f5c puppet/modules/puppet/manifests/init.pp
--- a/puppet/modules/puppet/manifests/init.pp	Fri Mar 27 07:40:33 2009 +0000
+++ b/puppet/modules/puppet/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
@@ -10,27 +10,27 @@ class puppet {
     #   * Installs /etc/puppet/puppetd.conf
     #   * Starts the puppet service
     define client (
-	$ensure = 'present',
-	$source = ''
+        $ensure = 'present',
+        $source = ''
     ) {
-	$real_source = $source ? {
-	    '' => "puppet://$servername/puppet/puppetd.conf",
-	    default => $source
-	}
+        $real_source = $source ? {
+            '' => "puppet://$servername/puppet/puppetd.conf",
+            default => $source
+        }
 
-	service { puppetd:
-	    ensure => running,
-	    require => File["/etc/puppet/puppetd.conf"]
-	}
+        service { puppetd:
+            ensure => running,
+            require => File["/etc/puppet/puppetd.conf"]
+        }
 
-	file { "/etc/puppet/puppetd.conf":
-	    ensure => $ensure,
-	    source => $real_source,
-	    mode => 444,
-	    owner => root,
-	    group => root,
-	    notify => Service[puppetd]
-	}
+        file { "/etc/puppet/puppetd.conf":
+            ensure => $ensure,
+            source => $real_source,
+            mode => 444,
+            owner => root,
+            group => root,
+            notify => Service[puppetd]
+        }
     }
     ################################################################
 
@@ -40,53 +40,53 @@ class puppet {
     #  * Ensures necessary directories exist
     #  * Starts puppetmasterd service
     define master (
-	$ensure = 'present',
-	$source = ''
+        $ensure = 'present',
+        $source = ''
     ) {
-	$real_source = $source ? {
-	    '' => "puppet://$servername/puppet/puppetmasterd.conf",
-	    default => $source
-	}
+        $real_source = $source ? {
+            '' => "puppet://$servername/puppet/puppetmasterd.conf",
+            default => $source
+        }
 
-	service { puppetmaster:
-	    ensure => running,
-	    require => File["/etc/puppet/puppetmasterd.conf"]
-	}
+        service { puppetmaster:
+            ensure => running,
+            require => File["/etc/puppet/puppetmasterd.conf"]
+        }
 
-	file { "/var/lib/puppet":
-	    ensure => directory,
-	    owner => puppet,
-	    group => puppet
-	}
-	file { "/var/lib/puppet/modules":
-	    ensure => directory,
-	    owner => puppet,
-	    group => puppet
-	}
-	file { "/var/lib/puppet/ssl":
-	    ensure => directory,
-	    owner => puppet,
-	    group => puppet
-	}
-	file { "/var/log/puppet":
-	    ensure => directory,
-	    owner => puppet,
-	    group => puppet
-	}
-	file { "/var/run/puppet":
-	    ensure => directory,
-	    owner => puppet,
-	    group => puppet
-	}
+        file { "/var/lib/puppet":
+            ensure => directory,
+            owner => puppet,
+            group => puppet
+        }
+        file { "/var/lib/puppet/modules":
+            ensure => directory,
+            owner => puppet,
+            group => puppet
+        }
+        file { "/var/lib/puppet/ssl":
+            ensure => directory,
+            owner => puppet,
+            group => puppet
+        }
+        file { "/var/log/puppet":
+            ensure => directory,
+            owner => puppet,
+            group => puppet
+        }
+        file { "/var/run/puppet":
+            ensure => directory,
+            owner => puppet,
+            group => puppet
+        }
 
-	file { "/etc/puppet/puppetmasterd.conf":
-	    ensure => $ensure,
-	    source => $real_source,
-	    mode => 444,
-	    owner => root,
-	    group => root,
-	    notify => Service[puppetmaster]
-	}
+        file { "/etc/puppet/puppetmasterd.conf":
+            ensure => $ensure,
+            source => $real_source,
+            mode => 444,
+            owner => root,
+            group => root,
+            notify => Service[puppetmaster]
+        }
     }
     ################################################################
 }
--------------------------------------------------------------------------------
  • Add Memory
  • Share This Entry
(0 comments)

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org

 
Notice: This account is set to log the IP addresses of everyone who comments.
Links will be displayed as unclickable URLs to help prevent spam.