[dak/master] debianqueued: set default paths to programs
This avoid repreating the same settings everywhere.
---
tools/debianqueued-0.9/config-security | 9 ---------
tools/debianqueued-0.9/config-security-disembargo | 9 ---------
tools/debianqueued-0.9/config-security-upload | 9 ---------
tools/debianqueued-0.9/config-upload | 9 ---------
tools/debianqueued-0.9/config-usper | 9 ---------
tools/debianqueued-0.9/debianqueued | 9 +++++++++
6 files changed, 9 insertions(+), 45 deletions(-)
diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security
index 595fe1d..c84c852 100644
--- a/tools/debianqueued-0.9/config-security
+++ b/tools/debianqueued-0.9/config-security
@@ -5,15 +5,6 @@
# set to != 0 for debugging output (to log file)
$debug = 0;
-# various programs:
-# -----------------
-$gpg = "/usr/bin/gpg";
-$ssh = "/usr/bin/ssh";
-$scp = "/usr/bin/scp";
-$ssh_agent = "/usr/bin/ssh-agent";
-$ssh_add = "/usr/bin/ssh-add";
-$mail = "/usr/sbin/sendmail";
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-security-disembargo b/tools/debianqueued-0.9/config-security-disembargo
index 606ae9d..738aa1f 100644
--- a/tools/debianqueued-0.9/config-security-disembargo
+++ b/tools/debianqueued-0.9/config-security-disembargo
@@ -5,15 +5,6 @@
# set to != 0 for debugging output (to log file)
$debug = 0;
-# various programs:
-# -----------------
-$gpg = "/usr/bin/gpg";
-$ssh = "/usr/bin/ssh";
-$scp = "/usr/bin/scp";
-$ssh_agent = "/usr/bin/ssh-agent";
-$ssh_add = "/usr/bin/ssh-add";
-$mail = "/usr/sbin/sendmail";
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-security-upload b/tools/debianqueued-0.9/config-security-upload
index e747197..4c6d77f 100644
--- a/tools/debianqueued-0.9/config-security-upload
+++ b/tools/debianqueued-0.9/config-security-upload
@@ -5,15 +5,6 @@
# set to != 0 for debugging output (to log file)
$debug = 0;
-# various programs:
-# -----------------
-$gpg = "/usr/bin/gpg";
-$ssh = "/usr/bin/ssh";
-$scp = "/usr/bin/scp";
-$ssh_agent = "/usr/bin/ssh-agent";
-$ssh_add = "/usr/bin/ssh-add";
-$mail = "/usr/sbin/sendmail";
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index 80bf38e..963a086 100644
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -5,15 +5,6 @@
# set to != 0 for debugging output (to log file)
$debug = 0;
-# various programs:
-# -----------------
-$gpg = "/usr/bin/gpg";
-$ssh = "/usr/bin/ssh";
-$scp = "/usr/bin/scp";
-$ssh_agent = "/usr/bin/ssh-agent";
-$ssh_add = "/usr/bin/ssh-add";
-$mail = "/usr/sbin/sendmail";
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-usper b/tools/debianqueued-0.9/config-usper
index 4d3e4f4..1815f38 100644
--- a/tools/debianqueued-0.9/config-usper
+++ b/tools/debianqueued-0.9/config-usper
@@ -5,15 +5,6 @@
# set to != 0 for debugging output (to log file)
$debug = 0;
-# various programs:
-# -----------------
-$gpg = "/usr/bin/gpg";
-$ssh = "/usr/bin/ssh";
-$scp = "/usr/bin/scp";
-$ssh_agent = "/usr/bin/ssh-agent";
-$ssh_add = "/usr/bin/ssh-add";
-$mail = "/usr/sbin/sendmail";
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index fd6504c..ecd46b0 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -37,6 +37,15 @@ $ENV{"LC_ALL"} = "C";
package conf;
( $conf::queued_dir = ( ( $0 !~ m,^/, ) ? POSIX::getcwd() . "/" : "" ) . $0 )
=~ s,/[^/]+$,,;
+
+# various programs:
+our $gpg = "/usr/bin/gpg";
+our $ssh = "/usr/bin/ssh";
+our $scp = "/usr/bin/scp";
+our $ssh_agent = "/usr/bin/ssh-agent";
+our $ssh_add = "/usr/bin/ssh-add";
+our $mail = "/usr/sbin/sendmail";
+
require "$conf::queued_dir/config";
my $junk = $conf::debug; # avoid spurious warnings about unused vars
$junk = $conf::ssh_key_file;
--
2.1.4
Reply to: