Update puppetlabs/apache and remove the Exec for restarting apache2 and tomcat

garr/shib2common/manifests/classes/certificate.pp

@@ -65,7 +65,7 @@ class shib2common::certificate (
       mode    => '0600',
       source  => "puppet:///modules/shib2common/certs/${hostname}-key-server.pem",
       require => File[$cert_directory],
-      notify  => Exec['shib2-apache-restart'];
+      notify  => Service['httpd'];
 
     "${cert_directory}/cert-server.pem":
       ensure  => present,
@@ -74,7 +74,7 @@ class shib2common::certificate (
       mode    => '0600',
       source  => "puppet:///modules/shib2common/certs/${hostname}-cert-server.pem",
       require => File[$cert_directory],
-      notify  => Exec['shib2-apache-restart'];
+      notify  => Service['httpd'];
   }
 
   # Install certificate files. They should be present in ${cert_directory} directory and
@@ -82,7 +82,7 @@ class shib2common::certificate (
   download_file { "${cert_directory}/Terena-chain.pem":
     url     => 'https://ca.garr.it/mgt/Terena-chain.pem',
     require => File[$cert_directory],
-    notify  => Exec['shib2-apache-restart'],
+    notify  => Service['httpd'],
   }
 
   # if nagiosserver is set, the activities to verify certificate expiration

garr/shib2common/manifests/classes/postinstall.pp

@@ -15,13 +15,13 @@ class shib2common::postinstall() {
   # Exec to restart tomcat and apache after installations and configuration
   $curtomcat = $::tomcat::curtomcat
   exec {
-    'shib2-tomcat-restart':
-      command     => "/usr/sbin/service ${curtomcat} restart",
-      refreshonly => true;
+    #'shib2-tomcat-restart':
+    #  command     => "/usr/sbin/service ${curtomcat} restart",
+    #  refreshonly => true;
 
-    'shib2-apache-restart':
-      command     => '/usr/sbin/service apache2 restart',
-      refreshonly => true;
+    #'shib2-apache-restart':
+    #  command     => '/usr/sbin/service apache2 restart',
+    #  refreshonly => true;
 
     'shib2-shibd-restart':
       command     => '/usr/sbin/service shibd restart',

garr/shib2common/manifests/classes/prerequisites.pp

@@ -72,20 +72,17 @@ class shib2common::prerequisites(
             package { 'apache2-utils':
                ensure => installed, 
             }
-
-            ::apache::mod { 'authn_core': }
         }
 
         class { 'apache':
             default_vhost => false,
             mpm_module    => 'prefork',
-         #   require       => [Host ['localhost'], Host ["$fqdn"]],
+            require       => [Host ['localhost'], Host ["$fqdn"]],
         }
 
-        # Install the module SSL, Proxy, Proxy AJP, PHP5
+        # Install the module SSL, Proxy, Proxy AJP
         class { 'apache::mod::ssl': }
         class { 'apache::mod::proxy': }
-        #class { 'apache::mod::php': }
 
         if ($install_tomcat == true) {
             # Install Tomcat application server.

garr/tomcat/manifests/init.pp

@@ -140,6 +140,7 @@ class tomcat {
     $catalina_home = $tomcat6::catalina_home
     
     $curtomcat = "tomcat6"
+
   }elsif($lsbdistid == 'Ubuntu'){
     include tomcat::tomcat7
     $tomcat_home = $tomcat7::tomcat_home

apache @ 511287b2

-Subproject commit 81069bc88af182757199d5af8d43da162931c0e9
+Subproject commit 511287b2968177fa000db4187cb23591a34b194d