changeset 248:72deb9ebb15e

Make sure that web server files come after package creates dir
author IBBoard <dev@ibboard.co.uk>
date Sat, 21 Dec 2019 14:31:41 -0500
parents 308f69ca988c
children e9323ff8f451
files modules/website/manifests/init.pp
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/modules/website/manifests/init.pp	Sat Dec 21 14:30:50 2019 -0500
+++ b/modules/website/manifests/init.pp	Sat Dec 21 14:31:41 2019 -0500
@@ -63,6 +63,7 @@
   file { $unused_default_mods:
     ensure => file,
     content => '',
+    require => Class['apache'],
   }
 
   file { $base_dir:
@@ -77,36 +78,43 @@
     ensure => directory,
     recurse => true,
     source => "puppet:///modules/website/conf.extra",
+    require => Class['apache'],
     notify => Service['httpd'];
   }
   file { '/etc/httpd/conf/mime.types':
     ensure => present,
     source => "puppet:///modules/website/mime.types",
+    require => Class['apache'],
     notify => Service['httpd'];
   }
   file { '/etc/php.d/datetime.ini':
     ensure => present,
     source => "puppet:///modules/website/datetime.ini",
+    require => Class['apache'],
     notify => Service['httpd'];
   }
   file { '/etc/httpd/conf.d/zzz-custom.conf':
     ensure => absent,
+    require => Class['apache'],
     notify => Service['httpd'];
   }
   file { '/etc/httpd/conf.d/zzz-0-custom.conf':
     ensure => present,
     source => "puppet:///modules/website/zzz-0-custom.conf",
+    require => Class['apache'],
     notify => Service['httpd'];
   }
   file { '/etc/httpd/conf.d/php.conf':
     ensure => present,
     source => "puppet:///modules/website/php.conf",
+    require => Class['apache'],
     notify => Service['httpd'];
   }
   file { '/etc/httpd/conf.custom':
     ensure => directory,
     recurse => true,
     source => "puppet:///private/apache/conf.custom",
+    require => Class['apache'],
     notify => Service['httpd']; 
   }
   file { $cert_dir: