diff --git a/manifests/app_type.pp b/manifests/app_type.pp index 851bd45..1996271 100644 --- a/manifests/app_type.pp +++ b/manifests/app_type.pp @@ -101,7 +101,7 @@ define sunetdrive::app_type ( content => template('sunetdrive/application/get_containers'), mode => '0744', } - if ($environment == 'test' and ($nodenumber == 3)) { + if ($nodenumber == 3) { file { '/usr/local/bin/scan_external_mounts': ensure => present, force => true, @@ -117,10 +117,6 @@ define sunetdrive::app_type ( ok_criteria => ['exit_status=0','max_age=2d'], warn_criteria => ['exit_status=1','max_age=3d'], } - cron { 'scan_external_mounts': - ensure => absent, - command => 'true', - } } file { '/opt/nextcloud/cron.sh': ensure => file, diff --git a/manifests/multinode.pp b/manifests/multinode.pp index 9ebec47..7cf12b8 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -46,26 +46,20 @@ class sunetdrive::multinode ( content => template('sunetdrive/application/get_containers'), mode => '0744', } - if ($environment == 'test') { - file { '/usr/local/bin/scan_external_mounts': - ensure => present, - force => true, - owner => 'root', - group => 'root', - content => template('sunetdrive/application/scan_external_mounts.sh'), - mode => '0744', - } - sunet::scriptherder::cronjob { 'scriptherder_scan_external_mounts': - cmd => '/usr/local/bin/scan_external_mounts', - hour => '1', - minute => '20', - ok_criteria => ['exit_status=0','max_age=2d'], - warn_criteria => ['exit_status=1','max_age=3d'], - } - cron { 'scan_external_mounts': - ensure => absent, - command => 'true', - } + file { '/usr/local/bin/scan_external_mounts': + ensure => present, + force => true, + owner => 'root', + group => 'root', + content => template('sunetdrive/application/scan_external_mounts.sh'), + mode => '0744', + } + sunet::scriptherder::cronjob { 'scriptherder_scan_external_mounts': + cmd => '/usr/local/bin/scan_external_mounts', + hour => '1', + minute => '20', + ok_criteria => ['exit_status=0','max_age=2d'], + warn_criteria => ['exit_status=1','max_age=3d'], } file { '/usr/local/bin/nocc': ensure => present,