From 8f42e0533bd34f1bc2200d8e97fbe729fe69f038 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 16 Mar 2012 22:46:51 +0000 Subject: move iurtupload.pp to iurt/upload.pp ( so everything related to iurt is in one directory ) --- modules/buildsystem/manifests/gatherer.pp | 2 +- modules/buildsystem/manifests/iurt/upload.pp | 16 ++++++++++++++++ modules/buildsystem/manifests/iurtupload.pp | 16 ---------------- modules/buildsystem/manifests/scheduler.pp | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 modules/buildsystem/manifests/iurt/upload.pp delete mode 100644 modules/buildsystem/manifests/iurtupload.pp diff --git a/modules/buildsystem/manifests/gatherer.pp b/modules/buildsystem/manifests/gatherer.pp index 29c0ac73..02287717 100644 --- a/modules/buildsystem/manifests/gatherer.pp +++ b/modules/buildsystem/manifests/gatherer.pp @@ -1,4 +1,4 @@ class buildsystem::gatherer { # that's emi - include iurtupload + include iurt::upload } diff --git a/modules/buildsystem/manifests/iurt/upload.pp b/modules/buildsystem/manifests/iurt/upload.pp new file mode 100644 index 00000000..e971e338 --- /dev/null +++ b/modules/buildsystem/manifests/iurt/upload.pp @@ -0,0 +1,16 @@ +class buildsystem::iurt::upload { + $login = $buildsystem::iurt::user::login + $homedir = $buildsystem::iurt::user::homedir + + file { '/etc/iurt/upload.conf': + require => File['/etc/iurt'], + content => template('buildsystem/upload.conf'), + notify => Exec['check iurt config'], + } + + exec { 'check iurt config': + refreshonly => true, + cmd => 'perl -cw /etc/iurt/upload.conf', + logoutput => 'on_failure', + } +} diff --git a/modules/buildsystem/manifests/iurtupload.pp b/modules/buildsystem/manifests/iurtupload.pp deleted file mode 100644 index d42dfa3a..00000000 --- a/modules/buildsystem/manifests/iurtupload.pp +++ /dev/null @@ -1,16 +0,0 @@ -class buildsystem::iurtupload { - $login = $buildsystem::iurt::user::login - $homedir = $buildsystem::iurt::user::homedir - - file { '/etc/iurt/upload.conf': - require => File['/etc/iurt'], - content => template('buildsystem/upload.conf'), - notify => Exec['check iurt config'], - } - - exec { 'check iurt config': - refreshonly => true, - cmd => 'perl -cw /etc/iurt/upload.conf', - logoutput => 'on_failure', - } -} diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp index 285eec69..296c184e 100644 --- a/modules/buildsystem/manifests/scheduler.pp +++ b/modules/buildsystem/manifests/scheduler.pp @@ -1,4 +1,4 @@ class buildsystem::scheduler { # ulri - include iurtupload + include iurt::upload } -- cgit v1.2.1