spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 12 ++++++++-- spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl | 2 - 2 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 0ca390cdf5ede9eb0a4509862b6077f42c55e1fc Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Sep 10 16:32:14 2010 +0200
point c2s to server.pem contained in the rhn-org-* pkg
diff --git a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd index ac0e54d..109b46a 100755 --- a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd +++ b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd @@ -23,7 +23,15 @@ use warnings; my $verbose = 0; my $macros = ''; my $help = 0; -my %macros = ('hostname' => Sys::Hostname::hostname()); +my %macros = ('hostname' => Sys::Hostname::hostname(), + 'server_pem' => '/etc/pki/spacewalk/jabberd/server.pem'); + +# Try to guess correct path to jabberd's server.pem +my $q = `rpm -qf /etc/jabberd/server.pem 2> /dev/null`; +chomp $q; +if ($q =~ /^rhn-(org-)?httpd-ssl-key-pair/) { + $macros{'server_pem'} = '/etc/jabberd/server.pem'; +}
GetOptions("macros:s" => $macros, "verbose" => $verbose, "help" => $help);
@@ -109,7 +117,7 @@ B<spacewalk-setup-jabberd> Specify macro names and corresponding macro values that will be used for substitution after document transformation. You can specify multiple macro:value pairs which you need to delimit by commas (example: ---macros hostname:host.domain.org,pemfile:/etc/pki/tls/certs/localhost.pem). +--macros hostname:host.domain.org,server_pem:/etc/pki/spacewalk/jabberd/server.pem).
=item B<--verbose>
diff --git a/spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl b/spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl index 9c5a0e7..0245da6 100644 --- a/spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl +++ b/spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl @@ -11,7 +11,7 @@ <xsl:template match="/c2s/local/id"> xsl:copy <xsl:attribute name="require-starttls">false</xsl:attribute> - <xsl:attribute name="pemfile">/etc/pki/spacewalk/jabberd/server.pem</xsl:attribute> + <xsl:attribute name="pemfile">@server_pem@</xsl:attribute> <xsl:attribute name="realm"></xsl:attribute> <xsl:attribute name="register-enable">true</xsl:attribute> xsl:text@hostname@</xsl:text>
spacewalk-commits@lists.fedorahosted.org