From 517adb146cd95239aa09dd8979ab6da02e41bbea Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Tue, 11 Dec 2012 11:33:39 +0000
Subject: buildsystem::signbot: move files from templates to files directory

The following files have been moved from templates to files directory
because they don't use any templating :
 - mga-signpackage
 - signbot-rpmmacros
 - sign-check-package
---
 modules/buildsystem/files/signbot/mga-signpackage  | 31 ++++++++++++++++++
 .../buildsystem/files/signbot/sign-check-package   | 37 ++++++++++++++++++++++
 .../buildsystem/files/signbot/signbot-rpmmacros    |  3 ++
 modules/buildsystem/manifests/signbot.pp           |  6 ++--
 .../buildsystem/templates/signbot/mga-signpackage  | 31 ------------------
 .../templates/signbot/sign-check-package           | 37 ----------------------
 .../templates/signbot/signbot-rpmmacros            |  3 --
 7 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100755 modules/buildsystem/files/signbot/mga-signpackage
 create mode 100644 modules/buildsystem/files/signbot/sign-check-package
 create mode 100644 modules/buildsystem/files/signbot/signbot-rpmmacros
 delete mode 100755 modules/buildsystem/templates/signbot/mga-signpackage
 delete mode 100644 modules/buildsystem/templates/signbot/sign-check-package
 delete mode 100644 modules/buildsystem/templates/signbot/signbot-rpmmacros

diff --git a/modules/buildsystem/files/signbot/mga-signpackage b/modules/buildsystem/files/signbot/mga-signpackage
new file mode 100755
index 00000000..bd88efeb
--- /dev/null
+++ b/modules/buildsystem/files/signbot/mga-signpackage
@@ -0,0 +1,31 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+use RPM4::Sign;
+use File::Spec;
+
+sub signpackage {
+    my ($file, $name, $path) = @_;
+
+    # check if parent directory is writable
+    my $parent = (File::Spec->splitpath($file))[1];
+    die "Unsignable package, parent directory is read-only"
+        unless -w $parent;
+
+    my $sign = RPM4::Sign->new(
+        name => $name,
+        path => $path,
+	passphrase => '',
+    );
+
+    $sign->rpmssign($file)
+}
+
+if (@ARGV != 3) {
+    exit 1;
+}
+
+signpackage(@ARGV);
+exit 0
+
diff --git a/modules/buildsystem/files/signbot/sign-check-package b/modules/buildsystem/files/signbot/sign-check-package
new file mode 100644
index 00000000..fc9704fd
--- /dev/null
+++ b/modules/buildsystem/files/signbot/sign-check-package
@@ -0,0 +1,37 @@
+#!/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"
+
+tmpdir=`mktemp -d ${TMPDIR:-/tmp}/signbot-XXXXX`
+tmpfile="$tmpdir/$(basename $file)"
+cp -pf "$file" "$tmpfile"
+rpm --delsign "$tmpfile"
+/usr/local/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/local/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
+done
+mv -f "$tmpfile" "$file"
+rmdir "$tmpdir"
diff --git a/modules/buildsystem/files/signbot/signbot-rpmmacros b/modules/buildsystem/files/signbot/signbot-rpmmacros
new file mode 100644
index 00000000..aab7e389
--- /dev/null
+++ b/modules/buildsystem/files/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/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index 5c3e222a..2aafee76 100644
--- a/modules/buildsystem/manifests/signbot.pp
+++ b/modules/buildsystem/manifests/signbot.pp
@@ -24,11 +24,11 @@ class buildsystem::signbot {
     }
 
     file { "$home_dir/.rpmmacros":
-        content => template('buildsystem/signbot/signbot-rpmmacros')
+        source => 'puppet:///modules/buildsystem/signbot/signbot-rpmmacros',
     }
 
     mga-common::local_script {
-        'sign-check-package': content => template('buildsystem/signbot/sign-check-package');
-        'mga-signpackage':    content => template('buildsystem/signbot/mga-signpackage');
+        'sign-check-package': source => 'puppet:///modules/buildsystem/signbot/sign-check-package';
+        'mga-signpackage':    source => 'puppet:///modules/buildsystem/signbot/mga-signpackage';
     }
 }
diff --git a/modules/buildsystem/templates/signbot/mga-signpackage b/modules/buildsystem/templates/signbot/mga-signpackage
deleted file mode 100755
index bd88efeb..00000000
--- a/modules/buildsystem/templates/signbot/mga-signpackage
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use warnings;
-use RPM4::Sign;
-use File::Spec;
-
-sub signpackage {
-    my ($file, $name, $path) = @_;
-
-    # check if parent directory is writable
-    my $parent = (File::Spec->splitpath($file))[1];
-    die "Unsignable package, parent directory is read-only"
-        unless -w $parent;
-
-    my $sign = RPM4::Sign->new(
-        name => $name,
-        path => $path,
-	passphrase => '',
-    );
-
-    $sign->rpmssign($file)
-}
-
-if (@ARGV != 3) {
-    exit 1;
-}
-
-signpackage(@ARGV);
-exit 0
-
diff --git a/modules/buildsystem/templates/signbot/sign-check-package b/modules/buildsystem/templates/signbot/sign-check-package
deleted file mode 100644
index fc9704fd..00000000
--- a/modules/buildsystem/templates/signbot/sign-check-package
+++ /dev/null
@@ -1,37 +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"
-
-tmpdir=`mktemp -d ${TMPDIR:-/tmp}/signbot-XXXXX`
-tmpfile="$tmpdir/$(basename $file)"
-cp -pf "$file" "$tmpfile"
-rpm --delsign "$tmpfile"
-/usr/local/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/local/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
-done
-mv -f "$tmpfile" "$file"
-rmdir "$tmpdir"
diff --git a/modules/buildsystem/templates/signbot/signbot-rpmmacros b/modules/buildsystem/templates/signbot/signbot-rpmmacros
deleted file mode 100644
index aab7e389..00000000
--- a/modules/buildsystem/templates/signbot/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}
-- 
cgit v1.2.1