java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java | 18 ++++++----
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 95f25906a9d7a2bd23d4291ab5acd14c8bfcb00e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 18 11:43:05 2010 +0100
checkstyle fixes
Line is longer than 92 characters. x6
grrr
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
index ebb6365..a758c18 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
@@ -30,8 +30,10 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser {
private ConfigureCertificateCommand cmd;
public void testCreateCommand() throws Exception {
- String originalConfigParent = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
- String originalConfigDisconnected = Config.get().getString(ConfigDefaults.DISCONNECTED);
+ String originalConfigParent =
+ Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigDisconnected =
+ Config.get().getString(ConfigDefaults.DISCONNECTED);
Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
"satellite.webqa.redhat.com");
@@ -59,13 +61,16 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser {
Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "");
}
else {
- Config.get().setBoolean(ConfigDefaults.DISCONNECTED, originalConfigDisconnected);
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED,
+ originalConfigDisconnected);
}
}
public void testCreateCommandIgnoreMismatch() throws Exception {
- String originalConfigParent = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
- String originalConfigDisconnected = Config.get().getString(ConfigDefaults.DISCONNECTED);
+ String originalConfigParent =
+ Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigDisconnected =
+ Config.get().getString(ConfigDefaults.DISCONNECTED);
Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
"satellite.webqa.redhat.com");
@@ -96,7 +101,8 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser {
Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "");
}
else {
- Config.get().setBoolean(ConfigDefaults.DISCONNECTED, originalConfigDisconnected);
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED,
+ originalConfigDisconnected);
}
}
14 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java | 31 +++++++---
1 file changed, 24 insertions(+), 7 deletions(-)
New commits:
commit b41a2aeb1c8ae6b47492b881d87cfef41d525199
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 18 11:32:25 2010 +0100
fixing ConfigureCertificateCommandTest
com.redhat.rhn.manager.satellite.test.ConfigureCertificateCommandTest.testCreateCommand
com.redhat.rhn.manager.satellite.test.ConfigureCertificateCommandTest.testCreateCommandIgnoreMismatch
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
index db36c76..ebb6365 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
@@ -30,10 +30,12 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser {
private ConfigureCertificateCommand cmd;
public void testCreateCommand() throws Exception {
- String originalConfig = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigParent = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigDisconnected = Config.get().getString(ConfigDefaults.DISCONNECTED);
Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
"satellite.webqa.redhat.com");
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "1");
user.addRole(RoleFactory.SAT_ADMIN);
cmd = new ConfigureCertificateCommand(user) {
protected Executor getExecutor() {
@@ -47,18 +49,27 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser {
assertNotNull(cmd.getCertificateText());
assertNull(cmd.storeConfiguration());
- if (originalConfig == null) {
+ if (originalConfigParent == null) {
Config.get().setString(ConfigDefaults.SATELLITE_PARENT, "");
}
else {
- Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfig);
+ Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfigParent);
+ }
+ if (originalConfigDisconnected == null) {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "");
+ }
+ else {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, originalConfigDisconnected);
}
}
public void testCreateCommandIgnoreMismatch() throws Exception {
- String originalConfig = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
- Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
+ String originalConfigParent = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigDisconnected = Config.get().getString(ConfigDefaults.DISCONNECTED);
+
+ Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
"satellite.webqa.redhat.com");
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "1");
user.addRole(RoleFactory.SAT_ADMIN);
cmd = new ConfigureCertificateCommand(user) {
protected Executor getExecutor() {
@@ -75,11 +86,17 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser {
assertNotNull(cmd.getCertificateText());
assertNull(cmd.storeConfiguration());
- if (originalConfig == null) {
+ if (originalConfigParent == null) {
Config.get().setString(ConfigDefaults.SATELLITE_PARENT, "");
}
else {
- Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfig);
+ Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfigParent);
+ }
+ if (originalConfigDisconnected == null) {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "");
+ }
+ else {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, originalConfigDisconnected);
}
}
14 years, 2 months
Changes to 'refs/tags/spacewalk-setup-jabberd-0.9.1-1'
by Miroslav Suchý
Tag 'spacewalk-setup-jabberd-0.9.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-02-18 09:37 +0000
Tagging package [spacewalk-setup-jabberd] version [0.9.1-1] in directory [spacewalk/spacewalk-setup-jabberd/].
Changes since rhn-client-tools-0.9.2-1:
Jan Pazdziora (6):
The getAvailableChannels is never called with useCache set to true, therefore is it always False, therefore no caching.
The getAvailableSubscriptions is never called with useCache True, removing the caching code and caching-only invocation.
Attribute read_reg_num_hw is only used to assign data, remove.
Parameter other not used at all in rhnreg.getAvailableChannels, remove it from invocations.
Since other is not used in rhnreg.getAvailableChannels anymore, no need to initialize it.
We have socket.settimeout in Python 2.3+.
Justin Sherrill (5):
few fixes for spacewalk-remove-channel
updating spacewalk-remove-channel and adding man page
updating spec file to include man page for spacewalk-remove-channel
fixing small typo in man page
adding repo deletion to channel remove script
Milan Zazrivec (1):
log every processed package
Miroslav Suchý (3):
566124 - remove dependency on Spacewalk::Setup
566124 - make new package spacewalk-setup-jabberd - split from spacewalk-setup
Automatic commit of package [spacewalk-setup-jabberd] release [0.9.1-1].
Tomas Lestach (2):
checkstyle fixes
combine several API call params to a single Map parameter
---
backend/satellite_tools/spacewalk-remove-channel | 20
backend/satellite_tools/spacewalk-remove-channel.sgml | 119 +++
backend/satellite_tools/updatePackages.py | 2
backend/spacewalk-backend.spec | 2
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 3
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 4
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 47 -
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 33
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 9
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 57 -
rel-eng/packages/spacewalk-setup-jabberd | 1
spacewalk/setup/bin/spacewalk-setup-jabberd | 9
spacewalk/setup/spacewalk-setup.spec | 5
spacewalk/spacewalk-setup-jabberd/LICENSE | 339 ++++++++++
spacewalk/spacewalk-setup-jabberd/Makefile | 1
spacewalk/spacewalk-setup-jabberd/Makefile.PL | 21
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 183 +++++
spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl | 27
spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl | 34 +
spacewalk/spacewalk-setup-jabberd/share/jabberd/sm.xsl | 17
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 63 +
21 files changed, 897 insertions(+), 99 deletions(-)
---
14 years, 2 months
3 commits - rel-eng/packages spacewalk/setup spacewalk/spacewalk-setup-jabberd
by Miroslav Suchý
rel-eng/packages/spacewalk-setup-jabberd | 1
spacewalk/setup/bin/spacewalk-setup-jabberd | 9
spacewalk/setup/spacewalk-setup.spec | 5
spacewalk/spacewalk-setup-jabberd/LICENSE | 339 ++++++++++
spacewalk/spacewalk-setup-jabberd/Makefile | 1
spacewalk/spacewalk-setup-jabberd/Makefile.PL | 21
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 183 +++++
spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl | 27
spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl | 34 +
spacewalk/spacewalk-setup-jabberd/share/jabberd/sm.xsl | 17
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 63 +
11 files changed, 691 insertions(+), 9 deletions(-)
New commits:
commit c0a2b46b2a938c805e0d24f0ee74263802b3842a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 18 10:37:31 2010 +0100
Automatic commit of package [spacewalk-setup-jabberd] release [0.9.1-1].
diff --git a/rel-eng/packages/spacewalk-setup-jabberd b/rel-eng/packages/spacewalk-setup-jabberd
new file mode 100644
index 0000000..4396a99
--- /dev/null
+++ b/rel-eng/packages/spacewalk-setup-jabberd
@@ -0,0 +1 @@
+0.9.1-1 spacewalk/spacewalk-setup-jabberd/
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
index 7accf1c..da57f7b 100644
--- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-jabberd
-Version: 0.9.0
+Version: 0.9.1
Release: 1%{?dist}
Summary: Tools to setup jabberd for Spacewalk
Group: Applications/System
@@ -58,6 +58,6 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
-* Thu Feb 18 2010 Miroslav Suchy <msuchy(a)redhat.com>
+* Thu Feb 18 2010 Miroslav Suchy <msuchy(a)redhat.com> 0.9.1-1
- Split from package spacewalk-setup.
commit 5f9d6fa189917df7722a20d9159967bf5125805c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 18 10:35:43 2010 +0100
566124 - make new package spacewalk-setup-jabberd - split from spacewalk-setup
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 0cb6f8e..15d995e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -27,16 +27,13 @@ Requires: perl-Satcon
Requires: spacewalk-backend-tools
Requires: cobbler >= 1.6.3
Requires: PyYAML
-Requires: jabberd
Requires: /usr/bin/gpg
-Requires: libxslt
-
+Requires: spacewalk-setup-jabberd
%description
A collection of post-installation scripts for managing Spacewalk's initial
setup tasks, re-installation, and upgrades.
-
%prep
%setup -q
diff --git a/spacewalk/spacewalk-setup-jabberd/LICENSE b/spacewalk/spacewalk-setup-jabberd/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/spacewalk/spacewalk-setup-jabberd/Makefile b/spacewalk/spacewalk-setup-jabberd/Makefile
new file mode 100644
index 0000000..2f885a3
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/Makefile
@@ -0,0 +1 @@
+include ../../rel-eng/Makefile
diff --git a/spacewalk/spacewalk-setup-jabberd/Makefile.PL b/spacewalk/spacewalk-setup-jabberd/Makefile.PL
new file mode 100644
index 0000000..a05459a
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/Makefile.PL
@@ -0,0 +1,21 @@
+use strict;
+use warnings;
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+ NAME => 'spacewalk-setup-jabberd',
+ AUTHOR => 'Miroslav Suchy <msuchy(a)redhat.com>',
+ VERSION_FROM => 'bin/spacewalk-setup-jabberd',
+ ABSTRACT_FROM => 'bin/spacewalk-setup-jabberd',
+ PL_FILES => {},
+ EXE_FILES => ['bin/spacewalk-setup-jabberd'],
+ PREREQ_PM => {
+ 'Test::More' => 0,
+ },
+ MAN1PODS => {
+ 'bin/spacewalk-setup-jabberd' => '$(INST_MAN1DIR)/spacewalk-setup-jabberd.$(MAN1EXT)',
+ },
+ dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+ clean => { },
+);
+
diff --git a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
new file mode 100755
index 0000000..ac0e54d
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
@@ -0,0 +1,183 @@
+#!/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/spacewalk-setup-jabberd/share/jabberd/c2s.xsl b/spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl
new file mode 100644
index 0000000..9c5a0e7
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/share/jabberd/c2s.xsl
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<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="realm"></xsl:attribute>
+ <xsl:attribute name="register-enable">true</xsl:attribute>
+ <xsl:text>@hostname@</xsl:text>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/c2s/authreg/module">
+ <xsl:copy>
+ <xsl:text>db</xsl:text>
+ </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl b/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl
new file mode 100644
index 0000000..95459c5
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/share/jabberd/s2s.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/s2s/local">
+ <xsl:copy>
+ <xsl:if test="not(resolver)">
+ <xsl:text>
+ </xsl:text>
+ <xsl:comment>
+ Helper DNS resolver component - if this component is not
+ connected, dialback connections will fail
+ (default: resolver) </xsl:comment>
+ <xsl:text>
+ </xsl:text>
+ <resolver>resolver</resolver>
+ <xsl:text>
+ </xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="@*|node()" />
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/s2s/check/interval">
+ <xsl:copy>3</xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/spacewalk/spacewalk-setup-jabberd/share/jabberd/sm.xsl b/spacewalk/spacewalk-setup-jabberd/share/jabberd/sm.xsl
new file mode 100644
index 0000000..83ce864
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/share/jabberd/sm.xsl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/sm/id">
+ <xsl:copy>
+ <xsl:text>@hostname@</xsl:text>
+ </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
new file mode 100644
index 0000000..7accf1c
--- /dev/null
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -0,0 +1,63 @@
+Name: spacewalk-setup-jabberd
+Version: 0.9.0
+Release: 1%{?dist}
+Summary: Tools to setup jabberd for Spacewalk
+Group: Applications/System
+License: GPLv2
+URL: https://fedorahosted.org/spacewalk
+Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: perl
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildArch: noarch
+Requires: perl
+Requires: libxslt
+Requires: jabberd
+
+%description
+Script, which setup Jabberd for Spacewalk. Used during installation of
+Spacewalk server or Spacewalk proxy.
+
+%prep
+%setup -q
+
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w %{buildroot}/*
+install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/
+install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/jabberd
+install -m 0644 share/jabberd/* %{buildroot}/%{_datadir}/spacewalk/setup/jabberd/
+
+# jabberd ssl cert location
+install -d -m 755 %{buildroot}/%{_sysconfdir}/pki/spacewalk/jabberd
+
+%check
+make test
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/spacewalk-setup-jabberd
+%{_mandir}/man1/*
+%{_datadir}/spacewalk/*
+%dir %{_sysconfdir}/pki/spacewalk
+%dir %{_sysconfdir}/pki/spacewalk/jabberd
+
+%changelog
+* Thu Feb 18 2010 Miroslav Suchy <msuchy(a)redhat.com>
+- Split from package spacewalk-setup.
+
commit fa8f531626fb6843ba1b540a3ba082f94326b656
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Feb 17 16:54:25 2010 +0100
566124 - remove dependency on Spacewalk::Setup
I would like to make this subpackage and use it during proxy instalation.
This dependecy will require that spacewalk-setup will be required spacewalk-proxy-installer, which we do now want to
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
index 52f67f6..022db00 100755
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -14,7 +14,6 @@
# in this software or its documentation.
#
-use Spacewalk::Setup;
use Sys::Hostname;
use Getopt::Long;
@@ -49,7 +48,7 @@ if ($macros) {
foreach my $basename ('c2s', 's2s', 'sm') {
my $configfile = "/etc/jabberd/$basename.xml";
- my $template = Spacewalk::Setup::SHARED_DIR . "/jabberd/$basename.xsl";
+ my $template = "/usr/share/spacewalk/setup/jabberd/$basename.xsl";
{
local $/ = undef;
@@ -59,7 +58,7 @@ foreach my $basename ('c2s', 's2s', 'sm') {
my $original = <F>;
close F;
- print Spacewalk::Setup::loc("Calling /usr/bin/xsltproc $template $configfile...\n") if $verbose;
+ 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 $?;
@@ -68,7 +67,7 @@ foreach my $basename ('c2s', 's2s', 'sm') {
}
if ($transformed ne $original) {
- print Spacewalk::Setup::loc("$configfile has been backed up to $configfile-swsave\n") if $verbose;
+ print "$configfile has been backed up to $configfile-swsave\n" if $verbose;
system('cp', '-p', '--backup=numbered', $configfile, "$configfile-swsave");
my @statistics = stat($configfile);
@@ -81,7 +80,7 @@ foreach my $basename ('c2s', 's2s', 'sm') {
chmod 0640, $configfile;
}
elsif ($verbose) {
- print Spacewalk::Setup::loc(" No changes were made\n");
+ print " No changes were made\n";
}
}
14 years, 2 months
5 commits - backend/satellite_tools backend/spacewalk-backend.spec
by Justin Sherrill
backend/satellite_tools/spacewalk-remove-channel | 20 ++-
backend/satellite_tools/spacewalk-remove-channel.sgml | 119 ++++++++++++++++++
backend/spacewalk-backend.spec | 2
3 files changed, 137 insertions(+), 4 deletions(-)
New commits:
commit f96836102393a37b44721b14068aab4a1015b653
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Feb 17 18:05:28 2010 -0500
adding repo deletion to channel remove script
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 2407fd4..c848327 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -20,7 +20,7 @@
import sys
import string
import os
-
+import shutil
from optparse import Option, OptionParser
@@ -315,6 +315,16 @@ def delete_channels(channelLabels, force=0, justdb=0):
h = rhnSQL.prepare(query % (table, field))
h.executemany(channel_id=channel_ids)
+ __deleteRepoData(channelLabels)
+
+
+def __deleteRepoData(labels):
+ dir = '/var/cache/' + CFG.repomd_path_prefix
+ for label in labels:
+ if os.path.isdir(dir + '/' + label):
+ shutil.rmtree(dir + '/' + label)
+
+
def list_packages(channelLabels, sources=0, force=0):
"List the source ids for the channels"
if sources:
commit 58f8d0a76c8d8d13d3ce7b742a44e30fe4d41172
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Feb 17 16:28:48 2010 -0500
fixing small typo in man page
diff --git a/backend/satellite_tools/spacewalk-remove-channel.sgml b/backend/satellite_tools/spacewalk-remove-channel.sgml
index f3ecc68..e8371f7 100644
--- a/backend/satellite_tools/spacewalk-remove-channel.sgml
+++ b/backend/satellite_tools/spacewalk-remove-channel.sgml
@@ -6,7 +6,7 @@
<refentry>
<RefMeta>
-<RefEntryTitle>spaceawlk-remove-channel</RefEntryTitle><manvolnum>8</manvolnum>
+<RefEntryTitle>spacewalk-remove-channel</RefEntryTitle><manvolnum>8</manvolnum>
<RefMiscInfo>Version 3.5.0</RefMiscInfo>
</RefMeta>
commit ab86f4d0a9be6adb94c92913b4a0b777ee0e6225
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Feb 17 11:54:44 2010 -0500
updating spec file to include man page for spacewalk-remove-channel
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c60cec7..2c8aae9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -598,7 +598,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{_mandir}/man8/spacewalk-debug.8*
%{_mandir}/man8/satpasswd.8*
%{_mandir}/man8/satwho.8*
-
+%{_mandir}/man8/spacewalk-remove-channel.8*
%files xml-export-libs
%defattr(-,root,root)
commit b58563862315442921edd8c10d341f2a6806a2bb
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Feb 17 11:52:15 2010 -0500
updating spacewalk-remove-channel and adding man page
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 706049a..2407fd4 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -72,7 +72,11 @@ def main():
dict_label, dict_parents = __listChannels()
if options.list:
+ lbls = []
for c in dict_label.keys():
+ lbls.append(c)
+ lbls.sort()
+ for c in lbls:
print c
return
@@ -294,6 +298,7 @@ def delete_channels(channelLabels, force=0, justdb=0):
tables = [
['rhnErrataFileChannel', 'channel_id'],
+ ['rhnErrataNotificationQueue', 'channel_id'],
['rhnChannelErrata', 'channel_id'],
['rhnChannelFamilyMembers', 'channel_id'],
['rhnChannelPackage', 'channel_id'],
diff --git a/backend/satellite_tools/spacewalk-remove-channel.sgml b/backend/satellite_tools/spacewalk-remove-channel.sgml
new file mode 100644
index 0000000..f3ecc68
--- /dev/null
+++ b/backend/satellite_tools/spacewalk-remove-channel.sgml
@@ -0,0 +1,119 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNCHANRM "Spacewalk Channel Removal tool" >
+
+]>
+<refentry>
+
+<RefMeta>
+<RefEntryTitle>spaceawlk-remove-channel</RefEntryTitle><manvolnum>8</manvolnum>
+<RefMiscInfo>Version 3.5.0</RefMiscInfo>
+</RefMeta>
+
+<RefNameDiv>
+<RefName><command>spaceawlk-remove-channel</command></RefName>
+<RefPurpose>
+Removes a channel from an RHN Satellite or Spacewalk server.
+</RefPurpose>
+</RefNameDiv>
+
+<RefSynopsisDiv>
+<Synopsis>
+ <cmdsynopsis>
+ <command>spaceawlk-remove-channel</command>
+ <arg>options <replaceable>...</replaceable></arg>
+ <arg>-c<replaceable>CHANNEL_LABEL</replaceable></arg>
+ <arg>--mount-point=<replaceable>CHANNEL_LABEL</replaceable></arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-u</arg> <arg>--unsubscribe</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-l</arg>
+ <arg>--list</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>--justdb</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-v</arg> <arg>--verbose</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>--force</arg>
+ </cmdsynopsis>
+</Synopsis>
+</RefSynopsisDiv>
+
+<RefSect1><Title>Description</Title>
+<para>
+ The <emphasis>spacewalk-channel-remove</emphasis> completely removes
+ channels (even Red Hat supplied ones) from a RHN Satellite or Spacewalk server.
+</para>
+<para>
+ By default systems are not unsubscribed from the specified channel(s). If systems
+ are currently subcribed, they will be listed. To unsubscribe these systems, simply
+ use the --unsubscribe option.
+</para>
+</RefSect1>
+
+<RefSect1><Title>Options</Title>
+<variablelist>
+ <varlistentry>
+ <term>-h, --help</term>
+ <listitem>
+ <para>Display the help screen with a list of options.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-l, --list</term>
+ <listitem>
+ <para>List all channels on the satellite.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-u, --unsubscribe</term>
+ <listitem>
+ <para>Unsubscribe any systems subscribed to the specified channels.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--justdb</term>
+ <listitem>
+ <para>Don't remove any files from the file system. Instead only delete metadata from the database.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-c<replaceable>CHANNEL</replaceable>,
+ --channel=<replaceable>CHANNEL</replaceable></term>
+ <listitem>
+ <para>Delete the channel with the specified label. May be used multiple times to specify multiple channels.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--force</term>
+ <listitem>
+ <para>Delete packages from the satellite even if the package is in more channels than what is specified. (Not Recommended)</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+</RefSect1>
+
+<RefSect1><Title>Examples</Title>
+<simplelist>
+ <member><command>spacewalk-remove-channel --list</command></member>
+ <member><command>spacewalk-remove-channel --channel=rhel-i386-as-3</command></member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>Authors</Title>
+<simplelist>
+ <member>Todd Warner <email>taw(a)redhat.com</email></member>
+ <member>Mihai Ibanescu <email>misa(a)redhat.com</email></member>
+ <member>Justin Sherrill <email>jsherril(a)redhat.com</email></member>
+</simplelist>
+</RefSect1>
+</RefEntry>
+
+<!--
+vim: sw=4
+-->
commit cf5971d42592b9852a15e9a3772e72140071fcf3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Feb 17 10:00:19 2010 -0500
few fixes for spacewalk-remove-channel
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
old mode 100644
new mode 100755
index af06ba3..706049a
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -21,7 +21,6 @@ import sys
import string
import os
-from progress_bar import ProgressBar
from optparse import Option, OptionParser
@@ -30,6 +29,7 @@ _LIBPATH = "/usr/share/rhn"
if _LIBPATH not in sys.path:
sys.path.append(_LIBPATH)
+from satellite_tools.progress_bar import ProgressBar
from common import CFG, initCFG, initLOG, log_debug, log_error
from server import rhnSQL
@@ -50,7 +50,6 @@ options_table = [
def main():
- print UNSUPPORTED_WARN
global options_table
parser = OptionParser(option_list=options_table)
14 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 51 +++++-----
1 file changed, 28 insertions(+), 23 deletions(-)
New commits:
commit 74e1cf87aec3b6e368930f6a61217c805764b329
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 17 17:19:55 2010 +0100
combine several API call params to a single Map parameter
because of checkstyle rule a method cannot have more than 12 parameters
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index c252755..de46f02 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -525,12 +525,14 @@ public class ChannelSoftwareHandler extends BaseHandler {
* @param archLabel Architecture label
* @param parentLabel Parent Channel label (may be null)
* @param checksumType checksum type for this channel
- * @param gpgKeyUrl GPG key URL
- * @param gpgKeyId GPG key ID
- * @param gpgKeyFingerprint GPG key Fingerprint
- * @param yumrepoUrl Associated Yum Repository URL
- * @param yumrepoLabel Associated Yum Repository Label
- * @param syncYumrepo Sync Yum Repository
+ * @param gpgKey a map consisting of
+ * <li>string url</li>
+ * <li>string id</li>
+ * <li>string fingerprint</li>
+ * @param yumRepo a map consisting of
+ * <li>string url</li>
+ * <li>string label</li>
+ * <li>boolean sync</li>
* @return 1 if creation of channel succeeds.
* @since 10.9
* @throws PermissionCheckFailureException thrown if user does not have
@@ -575,19 +577,23 @@ public class ChannelSoftwareHandler extends BaseHandler {
* only with newer clients: Fedora 11 and newer,
* or Enterprise Linux 6 and newer.")
* #options_end()
- * @xmlrpc.param #param_desc("string", "gpgKeyUrl", "GPG key URL")
- * @xmlrpc.param #param_desc("string", "gpgKeyId", "GPG key ID")
- * @xmlrpc.param #param_desc("string", "gpgKeyFingerprint", "GPG key Fingerprint")
- * @xmlrpc.param #param_desc("string", "yumrepoUrl", "Associated Yum Repository URL")
- * @xmlrpc.param #param_desc("string", "yumrepoLabel", "Associated Yum
- * Repository Label")
- * @xmlrpc.param #param_desc("boolean", "syncYumRepo", "Sync Yum Repository")
+ * @xmlrpc.param
+ * #struct("gpgKey")
+ * #prop_desc("string", "url", "GPG key URL")
+ * #prop_desc("string", "id", "GPG key ID")
+ * #prop_desc("string", "fingerprint", "GPG key Fingerprint")
+ * #struct_end()
+ * @xmlrpc.param
+ * #struct("yumRepo")
+ * #prop_desc("string", "url", "Associated Yum Repository URL")
+ * #prop_desc("string", "label", "Associated Yum Repository Label")
+ * #prop_desc("boolean", "sync", "Sync Yum Repository")
+ * #struct_end()
* @xmlrpc.returntype int - 1 if the creation operation succeeded, 0 otherwise
*/
public int create(String sessionKey, String label, String name,
String summary, String archLabel, String parentLabel, String checksumType,
- String gpgKeyUrl, String gpgKeyId, String gpgKeyFingerprint,
- String yumrepoUrl, String yumrepoLabel, Boolean syncYumrepo)
+ Map gpgKey, Map yumRepo)
throws PermissionCheckFailureException, InvalidChannelLabelException,
InvalidChannelNameException, InvalidParentChannelException {
@@ -603,12 +609,12 @@ public class ChannelSoftwareHandler extends BaseHandler {
ccc.setParentLabel(parentLabel);
ccc.setUser(user);
ccc.setChecksum(checksumType);
- ccc.setGpgKeyUrl(gpgKeyUrl);
- ccc.setGpgKeyId(gpgKeyId);
- ccc.setGpgKeyFp(gpgKeyFingerprint);
- ccc.setYumUrl(yumrepoUrl);
- ccc.setRepoLabel(yumrepoLabel);
- ccc.setSyncRepo(syncYumrepo);
+ ccc.setGpgKeyUrl((String)gpgKey.get("url"));
+ ccc.setGpgKeyId((String)gpgKey.get("id"));
+ ccc.setGpgKeyFp((String)gpgKey.get("fingerprint"));
+ ccc.setYumUrl((String)yumRepo.get("url"));
+ ccc.setRepoLabel((String)yumRepo.get("label"));
+ ccc.setSyncRepo(BooleanUtils.toBoolean((Boolean) yumRepo.get("sync")));
return (ccc.create() != null) ? 1 : 0;
}
@@ -676,8 +682,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
return create(sessionKey, label, name,
summary, archLabel, parentLabel, checksumType,
- null, null, null,
- null, null, Boolean.FALSE);
+ new HashMap(), new HashMap());
}
/**
14 years, 2 months
Changes to 'refs/tags/spacewalk-backend-0.8.46-1'
by Milan Zazrivec
Tag 'spacewalk-backend-0.8.46-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2010-02-17 14:39 +0000
Tagging package [spacewalk-backend] version [0.8.46-1] in directory [backend/].
Changes since spacewalk-java-0.8.13-1:
Milan Zazrivec (2):
log every processed package
Automatic commit of package [spacewalk-backend] release [0.8.46-1].
---
backend/satellite_tools/updatePackages.py | 2 ++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
14 years, 2 months
Branch 'SPACEWALK-0.8' - backend/spacewalk-backend.spec rel-eng/packages
by Milan Zazrivec
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit dddc1e3f9a8dcd5d9fa46a8278b93aae43601ef4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 17 15:39:55 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.46-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1bea5c8..3dcf188 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.45
+Version: 0.8.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -621,6 +621,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Feb 17 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 0.8.46-1
+- update-packages: log every processed package
+
* Thu Feb 11 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 0.8.45-1
- mechanism for updating existing sha256 packages
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 63bc5bd..944da96 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.45-1 backend/
+0.8.46-1 backend/
14 years, 2 months
Branch 'SPACEWALK-0.8' - backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/updatePackages.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit ea2401326cbac4a1c3a9e3587be7016f6335beb4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 17 15:33:56 2010 +0100
log every processed package
This comes in handy in case the update-packages --update-sha256 script
ends up with a traceback.
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index 64b5356..7326aac 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -310,6 +310,8 @@ def process_sha256_packages():
pb.printIncrement()
old_abs_path = os.path.join(CFG.MOUNT_POINT, package['path'])
+ if debug and verbose:
+ Log.writeMessage("Processing package: %s" % old_abs_path)
temp_file = open(old_abs_path, 'rb')
header, payload_stream, header_start, header_end = \
rhnPackageUpload.load_package(temp_file)
14 years, 2 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/updatePackages.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 57afcc2ec2f59980f05c99d7a8406a26bfd5fef2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 17 15:33:56 2010 +0100
log every processed package
This comes in handy in case the update-packages --update-sha256 script
ends up with a traceback.
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index 64b5356..7326aac 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -310,6 +310,8 @@ def process_sha256_packages():
pb.printIncrement()
old_abs_path = os.path.join(CFG.MOUNT_POINT, package['path'])
+ if debug and verbose:
+ Log.writeMessage("Processing package: %s" % old_abs_path)
temp_file = open(old_abs_path, 'rb')
header, payload_stream, header_start, header_end = \
rhnPackageUpload.load_package(temp_file)
14 years, 2 months