more

manifests/apache2.pp

@@ -5,6 +5,10 @@ class shibb_idp3::apache2 {
   # We use Stanford's apache module (also installs webauth).
   include apache
 
+  package { 'libapache2-mod-jk':
+    ensure => present,
+  }
+
   $apache_pool_fqdn     = $shibb_idp3::pool_fqdn
   $apache_pool_hostname = $shibb_idp3::pool_hostname
 
@@ -18,6 +22,7 @@ class shibb_idp3::apache2 {
   # We manage the Apache mod_jk worker.properties file.
   file { '/etc/libapache2-mod-jk/workers.properties':
     content => template('shibb_idp3/etc/libapache2-mod-jk/workers.properties.erb'),
+    require => Package['libapache2-mod-jk'],
   }
 
   # We want the "officially" signed certificate and private key for the

manifests/config.pp

@@ -140,12 +140,17 @@ class shibb_idp3::config {
     group   => 'tomcat8',
   }
 
-  file { '/opt/shibboleth-idp/flows/authn/TwoStepRemoteUser/twostepremoteuser-authn-flow.xml':
-    ensure  => present,
-    source  => 'puppet:///modules/shibb_idp3/opt/shibboleth-idp/flows/authn/TwoStepRemoteUser/twostepremoteuser-authn-flow.xml',
-    mode    => '0644',
-    owner   => 'tomcat8',
-    group   => 'tomcat8',
+  file {
+    '/opt/shibboleth-idp/flows/authn/TwoStepRemoteUser/':
+      ensure => directory,
+      owner   => 'tomcat8',
+      group   => 'tomcat8';
+    '/opt/shibboleth-idp/flows/authn/TwoStepRemoteUser/twostepremoteuser-authn-flow.xml':
+      ensure  => present,
+      source  => 'puppet:///modules/shibb_idp3/opt/shibboleth-idp/flows/authn/TwoStepRemoteUser/twostepremoteuser-authn-flow.xml',
+      mode    => '0644',
+      owner   => 'tomcat8',
+      group   => 'tomcat8',
   }