diff --git a/manifests/config.pp b/manifests/config.pp index f4c99fb..90d76fd 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -208,17 +208,17 @@ notify => Exec['ood-portal-generator-generate'], } exec { 'ood-portal-generator-generate': - path => '/usr/bin:/bin:/usr/sbin:/sbin', - command => '/opt/ood/ood-portal-generator/bin/generate -o /etc/ood/config/ood-portal.conf -d /etc/ood/dex/config.yaml', - refreshonly => true, - before => ::Apache::Custom_config['ood-portal'], + path => '/usr/bin:/bin:/usr/sbin:/sbin', + command => '/opt/ood/ood-portal-generator/bin/generate -o /etc/ood/config/ood-portal.conf -d /etc/ood/dex/config.yaml', + creates => '/etc/ood/config/ood-portal.conf', + before => ::Apache::Custom_config['ood-portal'], } include ::apache::params ::apache::custom_config { 'ood-portal': source => '/etc/ood/config/ood-portal.conf', filename => 'ood-portal.conf', - verify_command => $::apache::params::verify_command, + verify_command => "${apache::params::verify_command} || { /bin/rm -f /etc/ood/config/ood-portal.conf; exit 1; }", show_diff => false, owner => 'root', group => $apache::params::group,