improve Ubuntu/Debian support

modules/apache2/manifests/config_include.pp

@@ -1,13 +1,19 @@
 define apache2::config_include($content) {
 	# TODO verify the locataion of config includes accross distros
 	$apache_config_include_dir = $::operatingsystem ? {
-		Ubuntu => '/etc/httpd/conf.d',
+		Ubuntu => '/etc/apache2/conf.d',
 		CentOS => '/etc/httpd/conf.d',
-		Debian => '/etc/httpd/conf.d',
+		Debian => '/etc/apache2/conf.d',
 		default => '/etc/httpd/conf.d',
 	}
+	$apache_config_file_suffix = $::operatingsystem ? {
+		Ubuntu => '',
+		CentOS => '.conf',
+		Debian => '',
+		default => '.conf',
+	}
 
-	file { "${apache_config_include_dir}/${name}.conf":
+	file { "${apache_config_include_dir}/${name}${$apache_config_file_suffix}":
 		ensure => present,
 		content => "${content}",
 		owner => root,

modules/apache2/manifests/module.pp

@@ -0,0 +1,29 @@
+define apache2::module($ensure = 'enabled') {
+	case $::operatingsystem {
+		'debian', 'ubuntu': {
+			case $ensure {
+				'enabled': {
+					$command = 'a2enmod'
+					$test = '!'
+				}
+
+				default: {
+					$command = 'a2dismod'
+					$test = ''
+				}
+			}
+
+			exec { "apache2-module-${title}":
+				onlyif => "test ${test} -e '/etc/apache2/mods-enabled/${title}.load'",
+				command => "${command} '${title}'",
+				path => ['/usr/local/bin', '/sbin', '/bin', '/usr/sbin', '/usr/bin'],
+				require => Package['apache2'],
+				notify => Service['apache2-service'],
+			}
+		}
+
+		default: {
+			notice('not supported')
+		}
+	}
+}

modules/php5/manifests/apache_module.pp

@@ -3,16 +3,18 @@
 	include apache2
 
 	$php = $::operatingsystem ? {
-		Ubuntu => 'php5',
+		Ubuntu => 'libapache2-mod-php5',
 		CentOS => 'php',
-		Debian => 'php5',
+		Debian => 'libapache2-mod-php5',
 		default => 'php',
 	}
 
-	package { 'php5-apache_module':
+	package { 'php5-apache2_module':
 		name => "${php}",
 		ensure => latest,
 		subscribe => Package['php5-common'],
 		notify => Service['apache2-service'],
 	}
+
+	Service['apache2-service'] <~ Php5::Plugin<| |>
 }

modules/php5/manifests/mysql.pp

@@ -1,16 +1,11 @@
 class php5::mysql {
-	include php5::common
-
 	$php_mysql = $::operatingsystem ? {
 		Ubuntu => 'php5-mysql',
 		CentOS => 'php-mysql',
 		Debian => 'php5-mysql',
 		default => 'php-mysql',
 	}
 
-	package { 'php5-mysql':
-		name => "${php_mysql}",
-		ensure => latest,
-		notify => Package['php5-common'],
+	php5::plugin { $php_mysql:
 	}
 }

modules/php5/manifests/plugin.pp

@@ -0,0 +1,7 @@
+define php5::plugin() {
+	include php5::common
+
+	package { $title:
+		ensure => latest,
+	}
+}

modules/wordpress/templates/wordpress.conf.erb

@@ -27,7 +27,7 @@ Alias /<%= instance_alias %> "<%= instance_root %>"
     AllowOverride None
 
     #
-    # Cause the PHP interpreter to handle files with a .php extension.
+    # Cause the specified handler to handle files with a .php extension.
     #
     AddHandler php5-script .php
     AddType text/html .php