Merge branch 'master' of https://github.com/dschaaff/puppetmodule

fix Mac OS X support

Author: Daniel Schaaff

.fixtures.yml

@@ -0,0 +1,17 @@
+fixtures:
+    repositories:
+        stdlib:  "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+        apache:
+          repo: "git://github.com/puppetlabs/puppetlabs-apache.git"
+        puppetdb:
+          repo: "git://github.com/puppetlabs/puppetlabs-puppetdb.git"
+          ref: "4.3.0"
+        inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
+        concat: "git://github.com/ripienaar/puppet-concat.git"
+        file_concat:
+          repo: 'git://github.com/electrical/puppet-lib-file_concat.git'
+        apt:
+          repo: "git://github.com/puppetlabs/puppetlabs-apt"
+          ref: "2.2.0"
+    symlinks:
+        puppet: "#{source_dir}"

.gitignore

@@ -0,0 +1,8 @@
+pkg/*
+spec/fixtures/*
+Gemfile.lock
+*.swp
+.bundle/
+.rspec_system/
+vendor/
+.vagrant

.nodeset.yml

@@ -0,0 +1,31 @@
+---
+default_set: 'debian-70rc1-x64'
+sets:
+  'centos-59-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'centos-59-x64'
+  'centos-64-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'centos-64-x64'
+  'fedora-18-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'fedora-18-x64'
+  'debian-607-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'debian-607-x64'
+  'debian-70rc1-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'debian-70rc1-x64'
+  'ubuntu-server-10044-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'ubuntu-server-10044-x64'
+  'ubuntu-server-12042-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'ubuntu-server-12042-x64'

.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+bundler_args: --without system_tests
+rvm:
+  - 1.9.3
+  - 2.0.0
+script: "bundle exec rake test"
+env:
+  matrix:
+    - PUPPET_GEM_VERSION="~> 3.7.0"
+    - PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes" STRICT_VARIABLES="no"
+    - PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes" STRICT_VARIABLES="yes"
+    - PUPPET_GEM_VERSION="~> 4.0.0"
+    - PUPPET_GEM_VERSION="~> 4.0.0" STRICT_VARIABLES="yes"

manifests/agent.pp

@@ -513,4 +513,4 @@
       value   => $serialization_format,
     }
   }
-}
+}

manifests/master.pp

@@ -101,6 +101,7 @@
   $passenger_max_requests        = 10000,
   $passenger_stat_throttle_rate  = 30,
   $passenger_root                = undef,
+  $passenger_disable_mod_status  = true,
   $serialization_format          = undef,
   $serialization_package         = undef,
 ) inherits puppet::params {
@@ -159,6 +160,10 @@
     passenger_max_requests        => $passenger_max_requests,
     passenger_stat_throttle_rate  => $passenger_stat_throttle_rate,
     passenger_root                => $passenger_root,
+<<<<<<< HEAD
+=======
+    passenger_disable_mod_status  => $passenger_disable_mod_status,
+>>>>>>> ac41fc3fa574aff597dfb850595fefad4778ad56
   } ->
   Anchor['puppet::master::end']
 

manifests/passenger.pp

@@ -50,6 +50,7 @@
   $passenger_max_requests = 0,
   $passenger_stat_throttle_rate = 10,
   $passenger_root,
+  $passenger_disable_mod_status = true,
 ){
 
   class { 'apache':
@@ -61,7 +62,9 @@
     trace_enable        => 'Off',
   }
 
-  apache::mod { 'status': package_ensure => 'absent' }
+  if $passenger_disable_mod_status {
+    apache::mod { 'status': package_ensure => 'absent' }
+  }
 
   include puppet::params
   class { 'apache::mod::passenger':
@@ -199,4 +202,4 @@
     value   => 'SSL_CLIENT_VERIFY',
     require => File[$puppet_conf],
   }
-}
+}