diff options
| author | Michael Scherer <misc@mageia.org> | 2012-01-08 00:39:25 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-01-08 00:39:25 +0000 |
| commit | 25ae8d5bde6933ce0e9dff261a771abbd6deb7da (patch) | |
| tree | 6b97c09d0534d987a6c16144fb70f430324073e5 | |
| parent | 3f40f141daf05782b8db8e58cd93d357a5f1ae66 (diff) | |
| download | puppet-25ae8d5bde6933ce0e9dff261a771abbd6deb7da.tar puppet-25ae8d5bde6933ce0e9dff261a771abbd6deb7da.tar.gz puppet-25ae8d5bde6933ce0e9dff261a771abbd6deb7da.tar.bz2 puppet-25ae8d5bde6933ce0e9dff261a771abbd6deb7da.tar.xz puppet-25ae8d5bde6933ce0e9dff261a771abbd6deb7da.zip | |
revert commit 2140 ( since this does not work as i expected after reading source code )
| -rw-r--r-- | modules/buildsystem/manifests/signbot.pp | 6 | ||||
| -rw-r--r-- | modules/buildsystem/templates/sign-check-package (renamed from modules/buildsystem/templates/signbot/sign-check-package) | 0 | ||||
| -rw-r--r-- | modules/buildsystem/templates/signbot-rpmmacros (renamed from modules/buildsystem/templates/signbot/signbot-rpmmacros) | 0 | ||||
| -rw-r--r-- | modules/buildsystem/templates/sudoers.signpackage (renamed from modules/buildsystem/templates/signbot/sudoers.signpackage) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp index a10a1e91..6c0e46c4 100644 --- a/modules/buildsystem/manifests/signbot.pp +++ b/modules/buildsystem/manifests/signbot.pp @@ -24,17 +24,17 @@ class buildsystem { } sudo::sudoers_config { "signpackage": - content => template("buildsystem/signbot/sudoers.signpackage") + content => template("buildsystem/sudoers.signpackage") } file { "$sign_home_dir/.rpmmacros": mode => 644, - content => template("buildsystem/signbot/signbot-rpmmacros") + content => template("buildsystem/signbot-rpmmacros") } file { "/usr/local/bin/sign-check-package": mode => 755, - content => template("buildsystem/signbot/sign-check-package") + content => template("buildsystem/sign-check-package") } } } diff --git a/modules/buildsystem/templates/signbot/sign-check-package b/modules/buildsystem/templates/sign-check-package index 4c6d1937..4c6d1937 100644 --- a/modules/buildsystem/templates/signbot/sign-check-package +++ b/modules/buildsystem/templates/sign-check-package diff --git a/modules/buildsystem/templates/signbot/signbot-rpmmacros b/modules/buildsystem/templates/signbot-rpmmacros index aab7e389..aab7e389 100644 --- a/modules/buildsystem/templates/signbot/signbot-rpmmacros +++ b/modules/buildsystem/templates/signbot-rpmmacros diff --git a/modules/buildsystem/templates/signbot/sudoers.signpackage b/modules/buildsystem/templates/sudoers.signpackage index 2322c186..2322c186 100644 --- a/modules/buildsystem/templates/signbot/sudoers.signpackage +++ b/modules/buildsystem/templates/sudoers.signpackage |