Merge pull request #24 from Tribily/syntax-fix

Syntax fixes

Author: jamtur01

lib/puppet/type/a2mod.rb

@@ -12,5 +12,4 @@
 
     autorequire(:package) { catalog.resource(:package, 'httpd')}
 
-    end
-end
+end

manifests/init.pp

@@ -14,10 +14,12 @@
 #
 class apache {
   include apache::params
+
   package { 'httpd':
     name   => $apache::params::apache_name,
     ensure => installed,
   }
+
   service { 'httpd':
     name      => $apache::params::apache_name,
     ensure    => running,
@@ -26,7 +28,7 @@
   }
 
   file { "httpd_vdir":
-    name => $apache::params::vdir,
+    path => $apache::params::vdir,
     ensure  => directory,
     recurse => true,
     purge   => true,

manifests/params.pp

@@ -20,7 +20,7 @@
 
   $user          = 'www-data'
   $group         = 'www-data'
-  $ssl           = 'true'
+  $ssl           = true
   $template      = 'apache/vhost-default.conf.erb'
   $priority      = '25'
   $servername    = ''
@@ -30,7 +30,7 @@
   $options       = 'Indexes FollowSymLinks MultiViews'
   $vhost_name    = '*'
 
-  case $operatingsystem {
+  case $::operatingsystem {
     'centos', 'redhat', 'fedora', 'scientific': {
        $apache_name = 'httpd'
        $php_package = 'php'

manifests/ssl.pp

@@ -16,7 +16,7 @@
 
   include apache
 
-  case $operatingsystem {
+  case $::operatingsystem {
      'centos', 'fedora', 'redhat', 'scientific': {
         package { "apache_ssl_package":
            name    => "$apache::params::ssl_package",

manifests/vhost.pp

@@ -57,7 +57,7 @@
 
   # Since the template will use auth, redirect to https requires mod_rewrite
   if $redirect_ssl == true {
-    case $operatingsystem {
+    case $::operatingsystem {
       'debian','ubuntu': {
         A2mod <| title == 'rewrite' |>
       }
@@ -66,7 +66,7 @@
   }
 
   file { "${priority}-${name}.conf":
-      name    => "${apache::params::vdir}/${priority}-${name}.conf",
+      path    => "${apache::params::vdir}/${priority}-${name}.conf",
       content => template($template),
       owner   => 'root',
       group   => 'root',

manifests/vhost/proxy.pp

@@ -40,7 +40,7 @@
   }
 
   file { "${priority}-${name}":
-    name    => "${apache::params::vdir}/${priority}-${name}",
+    path    => "${apache::params::vdir}/${priority}-${name}",
     content => template($template),
     owner   => 'root',
     group   => 'root',

manifests/vhost/redirect.pp

@@ -30,7 +30,7 @@
   $srvname = $name
 
   file { "${priority}-${name}":
-    name    => "${apache::params::vdir}/${priority}-${name}",
+    path    => "${apache::params::vdir}/${priority}-${name}",
     content => template($template),
     owner   => 'root',
     group   => 'root',

files/test.vhost templates/test.vhost.erb

@@ -4,8 +4,8 @@
 NameVirtualHost *:80
 <VirtualHost *:80>
   ServerName testvhost
-  DocumentRoot /tmp/testvhost
-  <Directory /tmp/testvhost> 
+  DocumentRoot <%= docroot %>
+  <Directory <%= docroot %>> 
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
     Order allow,deny

tests/vhost.pp

@@ -1,2 +1,6 @@
 include apache
-apache::vhost { 'test.vhost': source => 'puppet:///modules/apache/test.vhost' }
+apache::vhost { 'test.vhost':
+  port     => 80,
+  docroot  => '/tmp/testvhost',
+  template => 'apache/test.vhost.erb'
+}