From d7851384c14811b58c0b196dece1adb27e5d0636 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sat, 7 Jan 2012 23:19:19 +0000
Subject: put signbot templates file in a subdirectory ( cleaner to not have
 everything in one directory )

---
 modules/buildsystem/manifests/signbot.pp           |  6 ++--
 modules/buildsystem/templates/sign-check-package   | 35 ----------------------
 modules/buildsystem/templates/signbot-rpmmacros    |  3 --
 .../templates/signbot/sign-check-package           | 35 ++++++++++++++++++++++
 .../templates/signbot/signbot-rpmmacros            |  3 ++
 .../templates/signbot/sudoers.signpackage          |  2 ++
 modules/buildsystem/templates/sudoers.signpackage  |  2 --
 7 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 modules/buildsystem/templates/sign-check-package
 delete mode 100644 modules/buildsystem/templates/signbot-rpmmacros
 create mode 100644 modules/buildsystem/templates/signbot/sign-check-package
 create mode 100644 modules/buildsystem/templates/signbot/signbot-rpmmacros
 create mode 100644 modules/buildsystem/templates/signbot/sudoers.signpackage
 delete mode 100644 modules/buildsystem/templates/sudoers.signpackage

diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index 6c0e46c4..a10a1e91 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/sudoers.signpackage")
+            content => template("buildsystem/signbot/sudoers.signpackage")
         }
 
         file { "$sign_home_dir/.rpmmacros":
 	        mode => 644,
-	        content => template("buildsystem/signbot-rpmmacros")
+	        content => template("buildsystem/signbot/signbot-rpmmacros")
 	    }
 
         file { "/usr/local/bin/sign-check-package":
             mode => 755,
-            content => template("buildsystem/sign-check-package")
+            content => template("buildsystem/signbot/sign-check-package")
         }
     }
 }
diff --git a/modules/buildsystem/templates/sign-check-package b/modules/buildsystem/templates/sign-check-package
deleted file mode 100644
index 4c6d1937..00000000
--- a/modules/buildsystem/templates/sign-check-package
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ $# != 3 ] ; then 
-    echo "missing arguments"
-    echo "usage : $0 file key_number key_directory"
-    exit 1
-fi
- 
-file="$1"
-key="$2"
-keydir="$3"
-
-tmpfile=`mktemp`
-cp -pf "$file" "$tmpfile"
-rpm --delsign "$tmpfile"
-/usr/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
-nbtry=0
-while rpmsign -Kv "$tmpfile" 2>&1 | grep BAD
-do
-    nbtry=$(($nbtry + 1))
-    if [ $nbtry -ge 30 ]
-    then
-	exit 1
-    fi
-
-    # Archive failed file for further analysis
-    mkdir -p "/tmp/failed-sign/"
-    failedfile="/tmp/failed-sign/$(basename "$file").$(date +%Y%m%d%H%M%S)"
-    cp -pf "$file" "$failedfile"
-
-    cp -pf "$file" "$tmpfile"
-    rpm --delsign "$tmpfile"
-    /usr/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
-done
-mv -f "$tmpfile" "$file"
diff --git a/modules/buildsystem/templates/signbot-rpmmacros b/modules/buildsystem/templates/signbot-rpmmacros
deleted file mode 100644
index aab7e389..00000000
--- a/modules/buildsystem/templates/signbot-rpmmacros
+++ /dev/null
@@ -1,3 +0,0 @@
-%__gpg_sign_cmd                 %{__gpg} \
-        gpg --batch --force-v3-sigs --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning \
-        -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}
diff --git a/modules/buildsystem/templates/signbot/sign-check-package b/modules/buildsystem/templates/signbot/sign-check-package
new file mode 100644
index 00000000..4c6d1937
--- /dev/null
+++ b/modules/buildsystem/templates/signbot/sign-check-package
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if [ $# != 3 ] ; then 
+    echo "missing arguments"
+    echo "usage : $0 file key_number key_directory"
+    exit 1
+fi
+ 
+file="$1"
+key="$2"
+keydir="$3"
+
+tmpfile=`mktemp`
+cp -pf "$file" "$tmpfile"
+rpm --delsign "$tmpfile"
+/usr/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
+nbtry=0
+while rpmsign -Kv "$tmpfile" 2>&1 | grep BAD
+do
+    nbtry=$(($nbtry + 1))
+    if [ $nbtry -ge 30 ]
+    then
+	exit 1
+    fi
+
+    # Archive failed file for further analysis
+    mkdir -p "/tmp/failed-sign/"
+    failedfile="/tmp/failed-sign/$(basename "$file").$(date +%Y%m%d%H%M%S)"
+    cp -pf "$file" "$failedfile"
+
+    cp -pf "$file" "$tmpfile"
+    rpm --delsign "$tmpfile"
+    /usr/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
+done
+mv -f "$tmpfile" "$file"
diff --git a/modules/buildsystem/templates/signbot/signbot-rpmmacros b/modules/buildsystem/templates/signbot/signbot-rpmmacros
new file mode 100644
index 00000000..aab7e389
--- /dev/null
+++ b/modules/buildsystem/templates/signbot/signbot-rpmmacros
@@ -0,0 +1,3 @@
+%__gpg_sign_cmd                 %{__gpg} \
+        gpg --batch --force-v3-sigs --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning \
+        -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}
diff --git a/modules/buildsystem/templates/signbot/sudoers.signpackage b/modules/buildsystem/templates/signbot/sudoers.signpackage
new file mode 100644
index 00000000..2322c186
--- /dev/null
+++ b/modules/buildsystem/templates/signbot/sudoers.signpackage
@@ -0,0 +1,2 @@
+<%= sched_login %>	ALL =(<%= sign_login %>) NOPASSWD: /usr/bin/mga-signpackage
+<%= sched_login %>	ALL =(<%= sign_login %>) NOPASSWD: /usr/local/bin/sign-check-package
diff --git a/modules/buildsystem/templates/sudoers.signpackage b/modules/buildsystem/templates/sudoers.signpackage
deleted file mode 100644
index 2322c186..00000000
--- a/modules/buildsystem/templates/sudoers.signpackage
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= sched_login %>	ALL =(<%= sign_login %>) NOPASSWD: /usr/bin/mga-signpackage
-<%= sched_login %>	ALL =(<%= sign_login %>) NOPASSWD: /usr/local/bin/sign-check-package
-- 
cgit v1.2.1