spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml | 2 +- spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml | 4 ++-- spacewalk/setup/bin/spacewalk-setup | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit 4b2827e870092406211fa3b2d6a667c9f050775c Author: Devan Goodwin dgoodwin@redhat.com Date: Thu Jul 23 13:19:31 2009 -0300
508187 - Fix jabberd configs on x86_64.
Hardcoded /usr/lib/jabberd/ in the jabber config files we drop into place during spacewalk-setup was breaking for x86_64, which should be lib64. Added a new macro to our copy of the config files and populate it during setup.
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml index ba1aa82..8b76c1a 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/c2s.xml @@ -318,7 +318,7 @@ <!-- Authentication/registration database configuration --> <authreg> <!-- Dynamic authreg modules path --> - <path>/usr/lib/jabberd</path> + <path>@@jabberDOTlibdir@@</path>
<!-- Backend module to use --> <module>db</module> diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml index 4b95480..6b9bb1f 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/jabberd/sm.xml @@ -69,7 +69,7 @@ <!-- Storage database configuration --> <storage> <!-- Dynamic storage modules path --> - <path>/usr/lib/jabberd</path> + <path>@@jabberDOTlibdir@@</path>
<!-- By default, we use the MySQL driver for all storage --> <driver>db</driver> @@ -326,7 +326,7 @@ doing. --> <modules> <!-- Dynamic sm modules path --> - <path>/usr/lib/jabberd</path> + <path>@@jabberDOTlibdir@@</path>
<!-- sess-start. The modules in this chain are called when a session is first started (usually on request by c2s as part of the diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 7a00825..7695584 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -947,6 +947,12 @@ sub populate_initial_configs {
my %nls_database_paramaters = Spacewalk::Setup::get_nls_database_parameters($answers);
+ # Check where jabberd's lib dir is, can vary on x86_64: + my $jabberdLibDir = "/usr/lib/jabberd/"; + if (-d "/usr/lib64/jabberd/") { + $jabberdLibDir = "/usr/lib64/jabberd"; + } + my %config_opts = ( mount_point => $answers->{'mount-point'} || '/var/satellite', @@ -968,6 +974,7 @@ sub populate_initial_configs { db_port => $answers->{'db-port'}, traceback_mail => $answers->{'admin-email'}, jabberDOTusername => 'rhn-dispatcher-sat', + jabberDOTlibdir => $jabberdLibDir, jabberDOTpassword => 'rhn-dispatcher-' . random_password(6), serverDOTsatelliteDOTca_chain => '/usr/share/rhn/RHNS-CA-CERT', serverDOTnls_lang => 'english.' . $nls_database_paramaters{NLS_CHARACTERSET},
spacewalk-commits@lists.fedorahosted.org