spacewalk/admin/Makefile.admin | 10 ------
spacewalk/admin/man/validate-sat-cert.pl.8 | 1
spacewalk/admin/man/validate-sat-cert.pod | 38 ++++++++++++++++++++++++
spacewalk/admin/rhn-config-satellite.pl | 35 +++++++++++++++++++++-
spacewalk/admin/rhn-sat-restart-silent | 18 +++++++++++
spacewalk/admin/rhn-satellite.obsolete | 7 ----
spacewalk/admin/spacewalk-admin.spec | 11 +++++-
spacewalk/admin/validate-sat-cert.pod | 38 ------------------------
spacewalk/setup/bin/spacewalk-make-mount-points | 38 +++++++++++++++++++-----
spacewalk/setup/spacewalk-setup.spec | 5 ++-
10 files changed, 135 insertions(+), 66 deletions(-)
New commits:
commit 08163087cc5b6a4e8dcdf88f2eb66dd3b2d08ba1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 13:31:35 2011 +0200
it is recomended to not use .gz extension as this may change in future
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index e5ff001..9a756c9 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/rhn-install-ssl-cert.pl
%{_sbindir}/rhn-sat-restart-silent
%{rhnroot}/RHN-GPG-KEY
-%{_mandir}/man8/validate-sat-cert.8.gz
+%{_mandir}/man8/validate-sat-cert.8*
%{_mandir}/man8/validate-sat-cert.pl.8*
%{_mandir}/man8/rhn-satellite.8*
%{_mandir}/man8/rhn-config-schema.pl.8*
commit 49d6446622fa707d7972b531b60dc17ca1dae7f6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 13:30:39 2011 +0200
create man page for validate-sat-cert.pl.8 as alias for validate-sat-cert.8
diff --git a/spacewalk/admin/man/validate-sat-cert.pl.8
b/spacewalk/admin/man/validate-sat-cert.pl.8
new file mode 100644
index 0000000..e8c8e8f
--- /dev/null
+++ b/spacewalk/admin/man/validate-sat-cert.pl.8
@@ -0,0 +1 @@
+.so man8/validate-sat-cert.8
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 1025cc4..e5ff001 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -41,6 +41,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
%{_bindir}/pod2man --section=8 rhn-sat-restart-silent >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-sat-restart-silent.8
%{_bindir}/pod2man --section=8 rhn-config-satellite.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-config-satellite.pl.8
install -p man/rhn-satellite.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -p man/validate-sat-cert.pl.8 $RPM_BUILD_ROOT%{_mandir}/man8/
install -p man/rhn-sudo-load-ssl-cert.8 $RPM_BUILD_ROOT%{_mandir}/man8/
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/*.8*
ln -s spacewalk-service $RPM_BUILD_ROOT%{_sbindir}/rhn-satellite
@@ -65,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/rhn-sat-restart-silent
%{rhnroot}/RHN-GPG-KEY
%{_mandir}/man8/validate-sat-cert.8.gz
+%{_mandir}/man8/validate-sat-cert.pl.8*
%{_mandir}/man8/rhn-satellite.8*
%{_mandir}/man8/rhn-config-schema.pl.8*
%{_mandir}/man8/rhn-load-ssl-cert.pl.8*
commit fbfff1e86cdb997ae881223c8d9144bc807125f8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 13:24:43 2011 +0200
move pod documentation to man/ directory
diff --git a/spacewalk/admin/man/validate-sat-cert.pod
b/spacewalk/admin/man/validate-sat-cert.pod
new file mode 100644
index 0000000..1cc522c
--- /dev/null
+++ b/spacewalk/admin/man/validate-sat-cert.pod
@@ -0,0 +1,38 @@
+=head1 NAME
+
+validate-sat-cert - utility that checks XML parse sanity and GPG validates an
+RHN Satellite certificate.
+
+=head2 SYNOPSIS
+
+B<validate-sat-cert> [B<--keyring /path/to/keyring.gpg>] [B<--quiet>]
+[B<--nosig>] [B<--required-version VERSION> CERTFILE]
+
+=head1 OPTIONS
+
+=over 5
+
+=item B<--keyring>
+
+Specify the keyring to use for GPG signature validation.
+
+=item B<--quiet>
+
+Suppress some messages; meant for scripted operation.
+
+=item B<--nosig>
+
+GPG signature not checked.
+
+=item B<--required-version>
+
+VERSION will enforce that the RHN certificate's version matches.
+
+=item B<--help>
+
+Display reference to this man page. :)
+
+=head1 SEE ALSO
+
+B<rhn-schema-version>(8), B<rmchannel>(8), B<satellite-debug>(8),
B<send-satellite-debug>(8), B<rhnpush>(8), B<satellite-sync>(8),
B<db-control>(1) (embedded satellite only),
+B<rhn-ssl-tool>(1), B<rhn-charsets>(8), B<rhn-satellite-activate>(8)
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index a20f458..1025cc4 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -34,7 +34,7 @@ make -f Makefile.admin install PREFIX=$RPM_BUILD_ROOT
(cd $RPM_BUILD_ROOT/%{_bindir} && ln -s validate-sat-cert.pl validate-sat-cert)
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
-%{_bindir}/pod2man --section=8 validate-sat-cert.pod >
$RPM_BUILD_ROOT%{_mandir}/man8/validate-sat-cert.8
+%{_bindir}/pod2man --section=8 man/validate-sat-cert.pod >
$RPM_BUILD_ROOT%{_mandir}/man8/validate-sat-cert.8
%{_bindir}/pod2man --section=8 rhn-config-schema.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-config-schema.pl.8
%{_bindir}/pod2man --section=8 rhn-load-ssl-cert.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-load-ssl-cert.pl.8
%{_bindir}/pod2man --section=8 man/spacewalk-service.pod >
$RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-service.8
diff --git a/spacewalk/admin/validate-sat-cert.pod
b/spacewalk/admin/validate-sat-cert.pod
deleted file mode 100644
index 1cc522c..0000000
--- a/spacewalk/admin/validate-sat-cert.pod
+++ /dev/null
@@ -1,38 +0,0 @@
-=head1 NAME
-
-validate-sat-cert - utility that checks XML parse sanity and GPG validates an
-RHN Satellite certificate.
-
-=head2 SYNOPSIS
-
-B<validate-sat-cert> [B<--keyring /path/to/keyring.gpg>] [B<--quiet>]
-[B<--nosig>] [B<--required-version VERSION> CERTFILE]
-
-=head1 OPTIONS
-
-=over 5
-
-=item B<--keyring>
-
-Specify the keyring to use for GPG signature validation.
-
-=item B<--quiet>
-
-Suppress some messages; meant for scripted operation.
-
-=item B<--nosig>
-
-GPG signature not checked.
-
-=item B<--required-version>
-
-VERSION will enforce that the RHN certificate's version matches.
-
-=item B<--help>
-
-Display reference to this man page. :)
-
-=head1 SEE ALSO
-
-B<rhn-schema-version>(8), B<rmchannel>(8), B<satellite-debug>(8),
B<send-satellite-debug>(8), B<rhnpush>(8), B<satellite-sync>(8),
B<db-control>(1) (embedded satellite only),
-B<rhn-ssl-tool>(1), B<rhn-charsets>(8), B<rhn-satellite-activate>(8)
commit 63955ec8181524c0befeb46f4c8f4c2f7bf88709
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 11:56:37 2011 +0200
add man page for rhn-config-satellite.pl
diff --git a/spacewalk/admin/rhn-config-satellite.pl
b/spacewalk/admin/rhn-config-satellite.pl
index d1b9896..8594c0c 100755
--- a/spacewalk/admin/rhn-config-satellite.pl
+++ b/spacewalk/admin/rhn-config-satellite.pl
@@ -36,7 +36,7 @@ if ($help) {
}
unless ($target and (@options)) {
- die $usage;
+ die B$usage;
}
my %options = map { split(/=/,$_, 2) } @options;
@@ -93,4 +93,37 @@ rename($tmpfile, $target) or die "Could not rename $tmpfile to
$target: $OS_ERRO
exit 0;
+=pod
+
+=head1 NAME
+
+rhn-config-satellite.pl - generate config files for Spacewalk server
+
+=head1 SYNOPSIS
+
+B<rhn-config-satellite.pl> --target=<target_file> --option=<key,value>
[ --option=<key,value> ...] [ --help ]
+
+=head1 DESCRIPTION
+
+This script will make sure that in F<target_file> are present configuration
variables in format C<key=value>. If such key already exist there, it is removed and
new variables are put at the end of the F<target_file>. Original file is preserved
as F<target_file.orig>
+
+This script is used internally by B<spacewalk-setup>(1)
+=head1 OPTIONS
+
+=over 5
+
+=item B<--option=<key,value>>
+
+Specify configuration variable and its value. It will be written to config file as
C<key=value>.
+
+=item B<--help>
+
+Write out short help.
+
+=back
+
+=head1 SEE ALSO
+
+B<spacewalk-setup>(1)
+=cut
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 81a6872..a20f458 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -39,6 +39,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
%{_bindir}/pod2man --section=8 rhn-load-ssl-cert.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-load-ssl-cert.pl.8
%{_bindir}/pod2man --section=8 man/spacewalk-service.pod >
$RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-service.8
%{_bindir}/pod2man --section=8 rhn-sat-restart-silent >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-sat-restart-silent.8
+%{_bindir}/pod2man --section=8 rhn-config-satellite.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-config-satellite.pl.8
install -p man/rhn-satellite.8 $RPM_BUILD_ROOT%{_mandir}/man8/
install -p man/rhn-sudo-load-ssl-cert.8 $RPM_BUILD_ROOT%{_mandir}/man8/
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/*.8*
@@ -70,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/rhn-sudo-load-ssl-cert.8*
%{_mandir}/man8/spacewalk-service.8*
%{_mandir}/man8/rhn-sat-restart-silent.8*
+%{_mandir}/man8/rhn-config-satellite.pl.8*
%changelog
* Fri Apr 29 2011 Jan Pazdziora 1.5.2-1
commit cb6c0cc97fa67a6b219cc2c18aa84a433badb386
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 11:18:07 2011 +0200
add man page for rhn-sat-restart-silent
diff --git a/spacewalk/admin/rhn-sat-restart-silent
b/spacewalk/admin/rhn-sat-restart-silent
index 93721cf..4847987 100644
--- a/spacewalk/admin/rhn-sat-restart-silent
+++ b/spacewalk/admin/rhn-sat-restart-silent
@@ -23,3 +23,21 @@
/usr/sbin/rhn-satellite restart &> /dev/null < /dev/null
+=pod
+
+=head1 NAME
+
+rhn-sat-restart-silent - restart Spacewalk silently
+
+=head1 SYNOPSIS
+
+B<rhn-sat-restart-silent>
+
+=head1 DESCRIPTION
+
+This command will restart all Spacewalk services and omit all output. Including errors!
+This script is used internally by Spacewalk server. You should never call it directly.
You should use B<spacewalk-service>(8) instead.
+
+=head1 SEE ALSO
+
+B<spacewalk-service>(8)
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index ba1571e..81a6872 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -38,6 +38,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
%{_bindir}/pod2man --section=8 rhn-config-schema.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-config-schema.pl.8
%{_bindir}/pod2man --section=8 rhn-load-ssl-cert.pl >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-load-ssl-cert.pl.8
%{_bindir}/pod2man --section=8 man/spacewalk-service.pod >
$RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-service.8
+%{_bindir}/pod2man --section=8 rhn-sat-restart-silent >
$RPM_BUILD_ROOT%{_mandir}/man8/rhn-sat-restart-silent.8
install -p man/rhn-satellite.8 $RPM_BUILD_ROOT%{_mandir}/man8/
install -p man/rhn-sudo-load-ssl-cert.8 $RPM_BUILD_ROOT%{_mandir}/man8/
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/*.8*
@@ -68,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/rhn-load-ssl-cert.pl.8*
%{_mandir}/man8/rhn-sudo-load-ssl-cert.8*
%{_mandir}/man8/spacewalk-service.8*
+%{_mandir}/man8/rhn-sat-restart-silent.8*
%changelog
* Fri Apr 29 2011 Jan Pazdziora 1.5.2-1
commit 14773b5d2e1213734929780fbcf82b48047f35e1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 10:59:27 2011 +0200
add man page for spacewalk-make-mount-points
diff --git a/spacewalk/setup/bin/spacewalk-make-mount-points
b/spacewalk/setup/bin/spacewalk-make-mount-points
index 63401bf..e3ac4ad 100755
--- a/spacewalk/setup/bin/spacewalk-make-mount-points
+++ b/spacewalk/setup/bin/spacewalk-make-mount-points
@@ -1,15 +1,8 @@
#!/usr/bin/perl
-# Given a list of directories (for example, /var/satellite)
-# check if they exist and if they do not exist, create them
-# with apache as owner. Also run restorecon on them, and
-# if they are nfs_t mounted, set spacewalk_nfs_mountpoint boolean.
-
use strict;
use warnings FATAL => 'all';
-use Spacewalk::Setup ();
-
my %dirs;
@dirs{@ARGV} = @ARGV;
@@ -56,3 +49,34 @@ if ($seen_nfs and Spacewalk::Setup::have_selinux()) {
exit 0;
+=pod
+
+=head1 NAME
+
+spacewalk-make-mount-points - prepare directories for Spacewalk
+
+=head1 SYNOPSIS
+
+spacewalk-make-mount-points [DIR1 [DIR2 ...]]
+
+=head1 DESCRIPTION
+
+Given a list of directories (for example, /var/satellite) this
+script will check if directories exist and if they do not exist,
+create them with apache as owner. Also run restorecon on them,
+and if they are nfs_t mounted, set spacewalk_nfs_mountpoint
+boolean.
+
+This script is not intended to be run directly by human.
+spacewalk-setup use this script internally.
+
+=head1 SEE ALSO
+
+spacewalk-setup(8)
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (c) 2011 Red Hat, Inc.
+Released under GNU General Public License, version 2 (GPLv2).
+
+=cut
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index e37786e..80bfa03 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -81,6 +81,8 @@ install -m 0755 share/oracle/upgrade-db.sh
%{buildroot}/%{_datadir}/spacewalk/se
# create a directory for misc. Spacewalk things
install -d -m 755 %{buildroot}/%{_var}/spacewalk
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+/usr/bin/pod2man --section=8 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-make-mount-points |
gzip > $RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-make-mount-points.8.gz
%check
make test
@@ -100,6 +102,7 @@ rm -rf %{buildroot}
%{_mandir}/man[13]/*.[13]*
%{_datadir}/spacewalk/*
%attr(755, apache, root) %{_var}/spacewalk
+%{_mandir}/man8/spacewalk-make-mount-points*
%changelog
* Mon Jul 11 2011 Jan Pazdziora 1.5.8-1
commit 3194a023ce5f7e85f355bebec8d1771a6efa8f20
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 31 10:03:47 2011 +0200
remove warning about obsolete rhn-satellite service
this warning has been there since spacewalk 0.4 and rhn satellite 5.3
it is time to remove it
diff --git a/spacewalk/admin/Makefile.admin b/spacewalk/admin/Makefile.admin
index 40a7a56..ae22751 100644
--- a/spacewalk/admin/Makefile.admin
+++ b/spacewalk/admin/Makefile.admin
@@ -19,13 +19,11 @@
BINDIR = /usr/bin
SBINDIR = /usr/sbin
-INITDIR = /etc/rc.d/init.d
GPGKEYDIR = /usr/share/rhn
VERSION = $(shell echo `awk '{ print $$1 }' version`)
PERL_DEST = $(PREFIX)/$(BINDIR)
-INIT_DEST = $(PREFIX)/$(INITDIR)
SBIN_DEST = $(PREFIX)/$(SBINDIR)
GPGKEY_DEST = $(PREFIX)/$(GPGKEYDIR)
@@ -49,20 +47,14 @@ DIR_INSTALL = install -d -m 755
# install scripts
all:
-install: $(PERL_SCRIPTS) $(PERL_DEST) INIT_SCRIPT $(GPGKEY_FILES) $(GPGKEY_DEST)
$(SBIN_SCRIPTS) $(SBIN_DEST)
+install: $(PERL_SCRIPTS) $(PERL_DEST) $(GPGKEY_FILES) $(GPGKEY_DEST) $(SBIN_SCRIPTS)
$(SBIN_DEST)
$(BIN_INSTALL) $(PERL_SCRIPTS) $(PERL_DEST)
$(GPGKEY_INSTALL) $(GPGKEY_FILES) $(GPGKEY_DEST)
$(BIN_INSTALL) $(SBIN_SCRIPTS) $(SBIN_DEST)
-INIT_SCRIPT: $(INIT_DEST)
- $(BIN_INSTALL) rhn-satellite.obsolete $(INIT_DEST)/rhn-satellite
-
$(PERL_DEST):
$(DIR_INSTALL) $@
-$(INIT_DEST):
- $(DIR_INSTALL) $@
-
$(GPGKEY_DEST):
$(DIR_INSTALL) $@
diff --git a/spacewalk/admin/rhn-satellite.obsolete
b/spacewalk/admin/rhn-satellite.obsolete
deleted file mode 100755
index 0ce8267..0000000
--- a/spacewalk/admin/rhn-satellite.obsolete
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo Warning: /etc/init.d/rhn-satellite is obsolete.
-echo Each service has its own init script now.
-echo The whole suite can be manipulated using command /usr/sbin/rhn-satellite instead.
-
-
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index d9a038f..ba1571e 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -51,7 +51,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{rhnroot}
%{_sbindir}/spacewalk-service
%{_sbindir}/rhn-satellite
-%{_initrddir}/rhn-satellite
%{_bindir}/validate-sat-cert.pl
%{_bindir}/validate-sat-cert
%{_bindir}/rhn-config-satellite.pl
commit ff5da21ee896b2a5aef006101eac91a96b4a68ab
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 24 12:49:25 2011 +0200
remove macro from changelog
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 63ce4f0..e37786e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -474,7 +474,7 @@ rm -rf %{buildroot}
* Mon Apr 06 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.6.1-1
- replace snail with worm (msuchy(a)redhat.com)
-- 391771 - removing usermod from install-db.sh, we should do it in %pre of some
+- 391771 - removing usermod from install-db.sh, we should do it in %%pre of some
rpm. (jpazdziora(a)redhat.com)
- bump Versions to 0.6.0 (jesusr(a)redhat.com)
- 469413 - included build number to the installation log file