Adding apache configuration

1 files changed, 11 insertions, 1 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 9fe06e4..cd82d38 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -23,11 +23,11 @@
 #
 #  http://reductivelabs.com/trac/puppet/wiki/Recipes/DebianApache2Recipe
 #
-# TODO: log level, log files, etc
 
 $apache2_sites  = "/etc/apache2/sites"
 $apache2_mods   = "/etc/apache2/mods"
 $apache2_macros = "/etc/apache2/conf.d/macros"
+$apache2_conf   = "/etc/apache2/apache2.conf"
 
 class apache {
 
@@ -65,6 +65,16 @@ class apache {
     notify  => Service["apache"],
   }
 
+  # apache mod_macro configuration
+  file { "${apache2_conf}":
+    ensure  => present,
+    content => template('apache/apache2.conf.erb'),
+    owner   => root,
+    group   => root,
+    mode    => 0644,
+    notify  => Service["apache"],
+  }
+
   # prepare variables to use in templates
   case $apache_www_folder {
     '': { $apache_www_folder = "/var/www" }