Adding mod_macro package and initial vhost code

diff --git a/manifests/init.pp b/manifests/init.pp
index 5172678ee707f41cb5e0e4b31c256dfcaca14ff7..7ec5169eaf0a849cf4fdd2df31c0af6dbc4a6bf2 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,11 +26,18 @@ $apache_www_folder   = '/var/www/sarava';
 
 class apache {
 
-  package { "apache": ensure => installed; }
+  package { "apache": ensure => installed, }
+
+  # TODO: enable mod_macro
+  package { "mod_macro":
+    name    => "libapache2-mod-macro",
+    ensure  => installed,
+    require => Package["apache"],
+  }
 
   service { "apache":
     ensure  => running,
-    require => Package["apache"],
+    require => Package["apache", "mod_macro"],
   }
 
   # apache mod_macro configuration
@@ -45,9 +52,7 @@ class apache {
   }
 
   # TODO: ensure folders exist with right modes and ownership
-  define website($ensure = present, $drupal = false, $pmwiki = false,
-                 $moin = false, $trac = false, $ikiwiki = false,
-                 $custom = false) {
+  define website($ensure = present, $alias = [], $use = []) {
     file { "/etc/apache2/sites-available/$title":
       ensure  => $ensure,
       content => template('apache/website.erb'),

diff --git a/templates/website.erb b/templates/website.erb
index 3398f6049cb8039801e95b68127da9b3f256e647..56be471f0f7878eba325dba04df7848316f028d9 100644 (file)
--- a/templates/website.erb
+++ b/templates/website.erb
@@ -1 +1,6 @@
-# TODO: virtual host definition
+# begin vhost for <%= $title %>
+<VirtualHost *:80>
+   # TODO
+   ServerName <%= $title %>.<%= $domain %>
+</VirtualHost>
+# end vhost for <%= $title %>