spacewalk/setup/Makefile.PL | 3
spacewalk/setup/bin/spacewalk-setup-jabberd | 183 ----------------------------
spacewalk/setup/spacewalk-setup.spec | 8 -
3 files changed, 1 insertion(+), 193 deletions(-)
New commits:
commit 9214d655249e7972c0b5857babd4fed7fbd0a4cf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 23 10:55:10 2010 +0100
spacewalk-setup-jabberd relics
(has been moved to independent package in 5f9d6fa189917df7722a20d9159967bf5125805c)
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index 5440217..b0b8061 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -8,13 +8,12 @@ WriteMakefile(
VERSION_FROM => 'lib/Spacewalk/Setup.pm',
ABSTRACT_FROM => 'lib/Spacewalk/Setup.pm',
PL_FILES => {},
- EXE_FILES => ['bin/spacewalk-setup',
'bin/spacewalk-setup-jabberd', 'bin/cobbler-setup',
'bin/spacewalk-make-mount-points'],
+ EXE_FILES => ['bin/spacewalk-setup',
'bin/cobbler-setup', 'bin/spacewalk-make-mount-points'],
PREREQ_PM => {
'Test::More' => 0,
},
MAN1PODS => { 'lib/Spacewalk/Setup.pm' =>
'$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)',
'bin/cobbler-setup' =>
'$(INST_MAN1DIR)/cobbler-setup.$(MAN1EXT)',
- 'bin/spacewalk-setup-jabberd' =>
'$(INST_MAN1DIR)/spacewalk-setup-jabberd.$(MAN1EXT)',
},
dist => { COMPRESS => 'gzip -9f', SUFFIX =>
'gz', },
clean => { FILES => 'Spacewalk-Setup-*' },
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd
b/spacewalk/setup/bin/spacewalk-setup-jabberd
deleted file mode 100755
index 022db00..0000000
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c) 2009 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use Sys::Hostname;
-use Getopt::Long;
-
-use strict 'refs';
-use warnings;
-
-my $verbose = 0;
-my $macros = '';
-my $help = 0;
-my %macros = ('hostname' => Sys::Hostname::hostname());
-
-GetOptions("macros:s" => \$macros, "verbose" => \$verbose,
"help" => \$help);
-
-if ($help) {
- print <<EOHELP;
-Usage: $0 --help | --verbose | --macros macros
-Options:
- --help Print this help message
- --verbose Verbose operation
- --macros Comma delimited list of macroname:macrovalue options
-EOHELP
-
- exit 0;
-}
-
-if ($macros) {
- foreach my $i (split(/,/, $macros, 0)) {
- my ($key, $value) = split(/:/, $i, 3);
- $macros{$key} = $value;
- }
-}
-
-foreach my $basename ('c2s', 's2s', 'sm') {
- my $configfile = "/etc/jabberd/$basename.xml";
- my $template = "/usr/share/spacewalk/setup/jabberd/$basename.xsl";
-
- {
- local $/ = undef;
-
- local *F;
- open F, $configfile or die "Error opening $configfile: $!\n";
- my $original = <F>;
- close F;
-
- print "Calling /usr/bin/xsltproc $template $configfile...\n" if $verbose;
- my $transformed = `/usr/bin/xsltproc $template $configfile`;
- die "There was an error running xsltproc\n" if $?;
-
- for my $key (keys %macros) {
- $transformed =~ s/\@$key\@/$macros{$key}/mg;
- }
-
- if ($transformed ne $original) {
- print "$configfile has been backed up to $configfile-swsave\n" if $verbose;
- system('cp', '-p', '--backup=numbered', $configfile,
"$configfile-swsave");
-
- my @statistics = stat($configfile);
-
- open F, ">$configfile";
- print F $transformed;
- close F;
-
- chown $statistics[4], $statistics[5], $configfile;
- chmod 0640, $configfile;
- }
- elsif ($verbose) {
- print " No changes were made\n";
- }
- }
-
-}
-
-1;
-
-=head1 NAME
-
-spacewalk-setup-jabberd - utility for configuring jabberd services to work with
-Spacewalk / Satellite
-
-=head1 SYNOPSIS
-
-B<spacewalk-setup-jabberd>
-[B<--help>]
-[B<--verbose>]
-[B<--macros macro1:macro1value,macro2:macro2value...>]
-
-=head1 OPTIONS
-
-=over 5
-
-=item B<--macros>
-
-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).
-
-=item B<--verbose>
-
-Verbose script operation.
-
-=item B<--help>
-
-Print help message.
-
-=back
-
-=head1 DESCRIPTION
-
-B<spacewalk-setup-jabberd> is utility for configuring jabbberd services to work
-with Spacewalk / Satellite. The script uses XSL transformations to change
-existing jabberd configuration files.
-
-Ordinarily, spacewalk-setup-jabberd is called by spacewalk-setup(1) during
-initial Spacewalk / Satellite configuration or upgrade.
-
-The script workflow is:
-
-=over 5
-
-=item
-
-Using xsltproc, apply appropriate XSL stylesheet to existing jabberd configuration
-file and read the transformed document.
-
-=item
-
-Substitute macros in transformed document (marked by two @ symbols, for example:
-@hostname@) with macro values (for example:
host.domain.org).
-
-=item
-
-Resulting file is written out while the original file is backed up.
-
-=back
-
-=head1 FILES
-
-XSL stylesheets used for transformation of existing jabberd configuration files:
-
-F</usr/share/spacewalk/setup/jabberd/c2s.xsl>
-
-F</usr/share/spacewalk/setup/jabberd/s2s.xsl>
-
-F</usr/share/spacewalk/setup/jabberd/sm.xsl>
-
-Jabberd configuration files modified by spacewalk-setup-jabberd:
-
-F</etc/jabberd/c2s.xsl>
-
-F</etc/jabberd/s2s.xsl>
-
-F</etc/jabberd/sm.xsl>
-
-=head1 SEE ALSO
-
-B<spacewalk-setup>(1) - Spacewalk setup program
-
-B<xsltproc>(1) - command line XSLT processor
-
-B<c2s>(8), B<router>(8), B<s2s>(8), B<sm>(8) - jabberd
components
-
-=head1 AUTHORS
-
-Milan Zazrivec
-
-=cut
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 9f62f4c..1a68fd3 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -65,13 +65,8 @@ install -m 0644 share/ssl.conf.6
%{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
-install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/jabberd
install -m 0755 share/upgrade/* %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
install -m 0644 share/defaults.d/defaults.conf
%{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
-install -m 0644 share/jabberd/* %{buildroot}/%{_datadir}/spacewalk/setup/jabberd/
-
-# jabberd ssl cert location
-install -d -m 755 %{buildroot}/%{_sysconfdir}/pki/spacewalk/jabberd
# Oracle specific stuff, possible candidate for sub-package down the road:
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/oracle/
@@ -94,13 +89,10 @@ rm -rf %{buildroot}
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/spacewalk-setup
-%{_bindir}/spacewalk-setup-jabberd
%{_bindir}/spacewalk-make-mount-points
%{_bindir}/cobbler-setup
%{_mandir}/man[13]/*.[13]*
%{_datadir}/spacewalk/*
-%dir %{_sysconfdir}/pki/spacewalk
-%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
* Fri Mar 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.1-1