Merge pull request jesseadams#1 from miketheman/COOK-1122

[COOK-1122] Adding support for amazon platform
phlipper · Apr 13, 2012 · 49e325b · 49e325b
2 parents 4eea256 + c3e1a7e
commit 49e325b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -28,7 +28,7 @@
   default['munin']['docroot'] = "/srv/http/munin"
   default['munin']['dbdir'] = "/var/lib/munin"
   default['munin']['root']['group'] = "root"
-when "centos","redhat"
+when "centos","redhat","amazon"
   default['munin']['basedir'] = "/etc/munin"
   default['munin']['plugin_dir'] = "/usr/share/munin/plugins"
   default['munin']['docroot'] = "/var/www/html/munin"

diff --git a/recipes/server.rb b/recipes/server.rb
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-node['apache']['default_modules'] << 'expires' if platform?("redhat", "centos", "scientific", "fedora")
+node['apache']['default_modules'] << 'expires' if platform?("redhat", "centos", "scientific", "fedora", "amazon")
 
 include_recipe "apache2"
 include_recipe "apache2::mod_rewrite"