diff --git a/manifests/app_type.pp b/manifests/app_type.pp index e791207..c279318 100644 --- a/manifests/app_type.pp +++ b/manifests/app_type.pp @@ -89,6 +89,14 @@ define sunetdrive::app_type ( $expiration_months = max(12, $full_backup_retention) $expiration_days_min = $expiration_months * 31 $expiration_days_max = $expiration_months * 31 + 93 + file { '/usr/local/bin/get_containers': + ensure => present, + force => true, + owner => 'root', + group => 'root', + content => template('sunetdrive/application/get_containers'), + mode => '0744', + } unless $is_multinode{ user { 'www-data': ensure => present, system => true } diff --git a/manifests/multinode.pp b/manifests/multinode.pp index 385b1cd..cf2bd71 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -87,14 +87,6 @@ class sunetdrive::multinode ( content => template('sunetdrive/multinode/get_non_paying_customers.erb.sh'), mode => '0744', } - file { '/usr/local/bin/get_containers': - ensure => present, - force => true, - owner => 'root', - group => 'root', - content => template('sunetdrive/multinode/get_containers'), - mode => '0744', - } file { '/usr/local/bin/restart_and_prune': ensure => present, force => true, diff --git a/templates/multinode/get_containers b/templates/application/get_containers similarity index 100% rename from templates/multinode/get_containers rename to templates/application/get_containers