spacewalk-commits February 2010

spacewalk-commits@lists.fedorahosted.org

6 participants
351 discussions

java/code
by Justin Sherrill 26 Feb '10

26 Feb '10

java/code/src/org/cobbler/CobblerObject.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) New commits: commit 4a13f480c34ea364fb285c80baf5bfcc832e6df1 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Feb 26 13:49:54 2010 -0500 531122 - fixing issue where <<inherit>> would appear within system records when modifying a kickstarts activation key diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/org/cobbler/CobblerObject.java index a543f74..df7121c 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -54,6 +54,7 @@ public abstract class CobblerObject { protected static final String UID = "uid"; protected static final String PROFILE = "profile"; private static final String REDHAT_KEY = "redhat_management_key"; + public static final String INHERIT_KEY = "<<inherit>>"; protected String handle; protected Map<String, Object> dataMap = new HashMap<String, Object>(); @@ -466,7 +467,7 @@ public abstract class CobblerObject { * @param keys the red hat activation keys in a set */ public void setRedHatManagementKey(Set<String> keys) { - modify(REDHAT_KEY, StringUtil.join(",", keys)); + modify(REDHAT_KEY, StringUtils.defaultString(StringUtil.join(",", keys))); } /** @@ -496,9 +497,15 @@ public abstract class CobblerObject { */ public void syncRedHatManagementKeys(Collection<String> keysToRemove, Collection<String> keysToAdd) { - Set keySet = getRedHatManagementKeySet(); + Set<String> keySet = getRedHatManagementKeySet(); keySet.removeAll(keysToRemove); keySet.addAll(keysToAdd); + if (keySet.size() > 1 && keySet.contains(INHERIT_KEY)) { + keySet.remove(INHERIT_KEY); + } + else if (keySet.isEmpty()) { + keySet.add(INHERIT_KEY); + } setRedHatManagementKey(keySet); }

1 0

backend/satellite_tools
by Justin Sherrill 25 Feb '10

25 Feb '10

backend/satellite_tools/spacewalk-remove-channel | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit 168f2ee415201678ec505844a4f98a18cd3ec007 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Thu Feb 25 11:50:44 2010 -0500 requiring root for spacewalk-remove-channel diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel index b000ada..5cbf367 100755 --- a/backend/satellite_tools/spacewalk-remove-channel +++ b/backend/satellite_tools/spacewalk-remove-channel @@ -53,6 +53,10 @@ options_table = [ def main(): + if os.getuid() != 0: + sys.stderr.write('ERROR: must be root to execute\n') + sys.exit(8) + global options_table parser = OptionParser(option_list=options_table)

1 0

backend/satellite_tools
by Justin Sherrill 24 Feb '10

24 Feb '10

backend/satellite_tools/spacewalk-remove-channel.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0beec57b96cce8e4d4a22e9ab52cb9ba92266642 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Feb 24 11:55:33 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 9d5cc1c..7bc79d2 100644 --- a/backend/satellite_tools/spacewalk-remove-channel.sgml +++ b/backend/satellite_tools/spacewalk-remove-channel.sgml @@ -98,7 +98,7 @@ Removes a channel from an RHN Satellite or Spacewalk server. <varlistentry> <term>-p, --skip-packages</term> <listitem> - <para>Do not remove the package metadata or the files on teh filesystem.</para> + <para>Do not remove the package metadata or the files from the filesystem.</para> </listitem> </varlistentry> </variablelist>

1 0

2 commits - backend/satellite_tools
by Justin Sherrill 24 Feb '10

24 Feb '10

backend/satellite_tools/spacewalk-remove-channel | 21 ++++++++++-------- backend/satellite_tools/spacewalk-remove-channel.sgml | 6 +++++ 2 files changed, 18 insertions(+), 9 deletions(-) New commits: commit c7d6287087505a26e7b44cd267a0b38c221d0fb2 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Feb 24 11:32:57 2010 -0500 updating man page for channel remove script diff --git a/backend/satellite_tools/spacewalk-remove-channel.sgml b/backend/satellite_tools/spacewalk-remove-channel.sgml index e8371f7..9d5cc1c 100644 --- a/backend/satellite_tools/spacewalk-remove-channel.sgml +++ b/backend/satellite_tools/spacewalk-remove-channel.sgml @@ -95,6 +95,12 @@ Removes a channel from an RHN Satellite or Spacewalk server. <para>Delete packages from the satellite even if the package is in more channels than what is specified. (Not Recommended)</para> </listitem> </varlistentry> + <varlistentry> + <term>-p, --skip-packages</term> + <listitem> + <para>Do not remove the package metadata or the files on teh filesystem.</para> + </listitem> + </varlistentry> </variablelist> </RefSect1> commit e2eda65039ac165a71465441d08049eeb2dbb134 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Feb 24 11:21:39 2010 -0500 adding a skip packages option to the channel delete script diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel index 2a3b91e..b000ada 100755 --- a/backend/satellite_tools/spacewalk-remove-channel +++ b/backend/satellite_tools/spacewalk-remove-channel @@ -36,16 +36,18 @@ from server import rhnSQL options_table = [ Option("-v", "--verbose", action="count", help="Increase verbosity"), + Option("-l", "--list", action="store_true", + help="List defined channels and exit"), Option("-c", "--channel", action="append", help="Delete this channel (can be present multiple times)"), Option("-u", "--unsubscribe", action="store_true", help="Unsubscribe systems registered to the specificed channels"), - Option( "--force", action="store_true", - help="Remove the channel packages from any other channels too"), Option( "--justdb", action="store_true", help="Delete only from the database, do not remove files from disk"), - Option("-l", "--list", action="store_true", - help="List defined channels and exit"), + Option( "--force", action="store_true", + help="Remove the channel packages from any other channels too (Not Recommended)"), + Option("-p", "--skip-packages", action="store_true", + help="Do not remove package metadata or packages from the filesystem (Not Recommended)"), ] @@ -110,7 +112,7 @@ def main(): try: delete_channels(channels.keys(), force=options.force, - justdb=options.justdb) + justdb=options.justdb, skip_packages=options.skip_packages) except: rhnSQL.rollback() raise @@ -238,7 +240,7 @@ def __listChannels(): return labels, parents -def delete_channels(channelLabels, force=0, justdb=0): +def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0): # Get the package ids if not channelLabels: return @@ -248,10 +250,11 @@ def delete_channels(channelLabels, force=0, justdb=0): srpms_ids = list_packages(channelLabels, force=force, sources=1) srpms_paths = _get_package_paths(srpms_ids, sources=1) - _delete_srpms(srpms_ids) - _delete_rpms(rpms_ids) + if not skip_packages: + _delete_srpms(srpms_ids) + _delete_rpms(rpms_ids) - if not justdb: + if not justdb and not skip_packages: _delete_files(rpms_paths + srpms_paths) # Get the channel ids

1 0

java/code
by Tomas Lestach 24 Feb '10

24 Feb '10

java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java | 4 java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartableTreeDetail.java | 42 ++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java | 7 - java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java | 70 ++++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java | 1 5 files changed, 119 insertions(+), 5 deletions(-) New commits: commit 951c44cfff631ef80a43a3a3c6d534578187ac84 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Feb 24 17:15:29 2010 +0100 493176 - kickstart.tree.getDetails API changes - introducing install_type - introducing abs_patch instead of the base_path diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java index 88e665a..72db2ea 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java @@ -247,12 +247,12 @@ public class KickstartableTree extends BaseDomainHelper { /** * Basically returns the actual basepath - * we need this method becasue the + * we need this method because the * database stores rhn/.... as basepath for redhat channels * and actual path for non redhat channels... * @return the actual basepath. */ - private String getAbsolutePath() { + public String getAbsolutePath() { if (isRhnTree()) { //redhat channel append the mount point to //base path... diff --git a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartableTreeDetail.java b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartableTreeDetail.java new file mode 100644 index 0000000..91ab266 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartableTreeDetail.java @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010 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. + */ +package com.redhat.rhn.frontend.dto.kickstart; + +import com.redhat.rhn.domain.kickstart.KickstartableTree; + + +/** + * KickstartableTreeDetail + * @version $Rev$ + */ +public class KickstartableTreeDetail extends KickstartableTree { + + /** + * @param tree kickstart tree as origin + */ + public KickstartableTreeDetail(KickstartableTree tree) { + this.setBasePath(tree.getBasePath()); + this.setChannel(tree.getChannel()); + this.setId(tree.getId()); + this.setInstallType(tree.getInstallType()); + this.setLabel(tree.getLabel()); + this.setLastModified(tree.getLastModified()); + this.setCobblerId(tree.getCobblerId()); + this.setCobblerXenId(tree.getCobblerXenId()); + this.setOrg(tree.getOrg()); + this.setTreeType(tree.getTreeType()); + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java index 1f0113e..1500a08 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java @@ -21,6 +21,7 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartInstallType; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDetail; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException; import com.redhat.rhn.manager.channel.ChannelManager; @@ -49,9 +50,9 @@ public class KickstartTreeHandler extends BaseHandler { * @xmlrpc.param #param("string", "sessionKey") * @xmlrpc.param #param_desc("string", "treeLabel", "Label of kickstartable tree to * search.") - * @xmlrpc.returntype $KickstartTreeSerializer + * @xmlrpc.returntype $KickstartTreeDetailSerializer */ - public KickstartableTree getDetails(String sessionKey, String treeLabel) { + public KickstartableTreeDetail getDetails(String sessionKey, String treeLabel) { User loggedInUser = getLoggedInUser(sessionKey); ensureConfigAdmin(loggedInUser); @@ -60,7 +61,7 @@ public class KickstartTreeHandler extends BaseHandler { throw new InvalidChannelLabelException(); } - return tree; + return new KickstartableTreeDetail(tree); } /** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java new file mode 100644 index 0000000..f80e55e --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) 2010 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. + */ +package com.redhat.rhn.frontend.xmlrpc.serializer; + +import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDetail; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + +import java.io.IOException; +import java.io.Writer; + +import redstone.xmlrpc.XmlRpcCustomSerializer; +import redstone.xmlrpc.XmlRpcException; +import redstone.xmlrpc.XmlRpcSerializer; + + +/** + * KickstartTreeDetailSerializer + * @version $Rev$ + * + * @xmlrpc.doc + * + * #struct("kickstartable tree") + * #prop("int", "id") + * #prop("string", "label") + * #prop("string", "abs_path") + * #prop("int", "channel_id") + * $KickstartInstallTypeSerializer + * #struct_end() + */ +public class KickstartTreeDetailSerializer implements XmlRpcCustomSerializer { + + /** + * {@inheritDoc} + */ + public Class getSupportedClass() { + return KickstartableTreeDetail.class; + } + + /** + * {@inheritDoc} + * @throws IOException + */ + public void serialize(Object value, Writer output, + XmlRpcSerializer builtInSerializer) + throws XmlRpcException, IOException { + + KickstartableTreeDetail treeDetail = (KickstartableTreeDetail) value; + SerializerHelper helper = new SerializerHelper(builtInSerializer); + + helper.add("id", treeDetail.getId()); + helper.add("label", treeDetail.getLabel()); + helper.add("abs_path", treeDetail.getAbsolutePath()); + helper.add("channel_id", treeDetail.getChannel().getId()); + helper.add("install_type", treeDetail.getInstallType()); + helper.writeTo(output); + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java index 6bcae3c..6060ca4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java @@ -65,6 +65,7 @@ public class SerializerRegistry { SERIALIZER_CLASSES.add(SystemOverviewSerializer.class); SERIALIZER_CLASSES.add(UserSerializer.class); SERIALIZER_CLASSES.add(KickstartTreeSerializer.class); + SERIALIZER_CLASSES.add(KickstartTreeDetailSerializer.class); SERIALIZER_CLASSES.add(BigDecimalSerializer.class); SERIALIZER_CLASSES.add(ConfigRevisionSerializer.class); SERIALIZER_CLASSES.add(ConfigChannelSerializer.class);

1 0

proxy/installer proxy/proxy
by Miroslav Suchý 24 Feb '10

24 Feb '10

proxy/installer/c2s.xml | 347 ---------------------- proxy/installer/configure-proxy.sh | 3 proxy/installer/sm.xml | 379 ------------------------- proxy/installer/spacewalk-proxy-installer.spec | 4 proxy/proxy/spacewalk-proxy.spec | 2 5 files changed, 2 insertions(+), 733 deletions(-) New commits: commit 2a53041fa4ce870cab91a732a9368b5cac49af89 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Feb 24 17:08:53 2010 +0100 566124 - do not distribute jabber configuration file use spacewalk-setup-jabberd to edit jabberd conf file diff --git a/proxy/installer/c2s.xml b/proxy/installer/c2s.xml deleted file mode 100644 index fbbff1b..0000000 --- a/proxy/installer/c2s.xml +++ /dev/null @@ -1,347 +0,0 @@ - -<c2s> -  - <id>c2s</id> - -  - <pidfile>/var/run/jabberd/jabberd-c2s.pid</pidfile> - -  - <router> -  - <ip>127.0.0.1</ip>  - <port>5347</port>  - -  - <user>jabberd</user>  - <pass>secret</pass>  - -  - - <pemfile>/etc/jabberd/server.pem</pemfile> - -  - <retry> -  - <init>3</init> - -  - <lost>3</lost> - -  - <sleep>2</sleep> - </retry> - </router> - -  - <log type='syslog'> -  - <ident>jabberd/c2s</ident> - -  - <facility>local3</facility> - -  -  - </log> - -  - <local> -  - <id>${session.hostname}</id> -  - -  - <ip>0.0.0.0</ip> - -  - <port>5222</port> - -  - <pemfile>/etc/jabberd/server.pem</pemfile> - -  -  - -  -  - </local> - -  - <io> -  - <max_fds>1024</max_fds> - -  - <limits> -  - <bytes>0</bytes> - -  - <connects>0</connects> - </limits> - -  - <access> -  - <order>allow,deny</order> - -  -  - -  -  - -  -  - </access> - -  - <check> -  - <interval>0</interval> - -  - <idle>0</idle> - -  - <keepalive>0</keepalive> - - </check> - - </io> - -  - <authreg> -  - <module>db</module> - -  - <register> -  - <enable/> - -  - <instructions>Enter a username and password to register with this server.</instructions> - -  -  - </register> - -  - <mechanisms> - -  - <traditional> - <plain/> - <digest/> - <zerok/> - </traditional> - -  - <sasl> - <plain/> - <digest-md5/> -  - </sasl> - - </mechanisms> - -  - <mysql> -  - <host>localhost</host> - <port>3306</port> - -  - <dbname>jabberd2</dbname> - -  - <user>jabberd2</user> - <pass>secret</pass> - </mysql> - -  - <pgsql> -  - <host>localhost</host> - <port>5432</port> - -  - <dbname>jabberd2</dbname> - -  - <user>jabberd2</user> - <pass>secret</pass> - </pgsql> - -  - <db> -  - <path>/var/lib/jabberd</path> - -  - <sync/> - </db> - -  - <ldap> -  - <host>ldap.example.com</host> - <port>389</port> - -  -  - -  -  - -  -  - -  -  - -  - <uidattr>uid</uidattr> - -  - <basedn realm='company'>o=Company.com</basedn> - <basedn>o=Example Corp.</basedn> - </ldap> - -  - <pipe> -  - <exec>/usr/bin/pipe-auth.pl</exec> - </pipe> - - </authreg> - -</c2s> diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index afd2de7..b1ccf9c 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -349,8 +349,7 @@ fi SQUID_SIZE=$(df -P /var/spool/squid | awk '{a=$4} END {printf("%d", a * 60 / 100 / 1024)}') ln -sf /etc/pki/spacewalk/jabberd/server.pem /etc/jabberd/server.pem -sed "s/\${session.hostname\}/$HOSTNAME/g" < $DIR/c2s.xml > $JABBERD_DIR/c2s.xml -sed "s/\${session.hostname\}/$HOSTNAME/g" < $DIR/sm.xml > $JABBERD_DIR/sm.xml +/usr/bin/spacewalk-setup-jabberd --macros "hostname:$HOSTNAME" sed "s|cache_dir ufs /var/spool/squid 15000 16 256|cache_dir ufs /var/spool/squid $SQUID_SIZE 16 256|g" \ < $DIR/squid.conf > $SQUID_DIR/squid.conf sed -e "s|\${session.ca_chain:/usr/share/rhn/RHNS-CA-CERT}|$CA_CHAIN|g" \ diff --git a/proxy/installer/sm.xml b/proxy/installer/sm.xml deleted file mode 100644 index 1330cfa..0000000 --- a/proxy/installer/sm.xml +++ /dev/null @@ -1,379 +0,0 @@ - -<sm> -  - <id>${session.hostname}</id> - -  - <pidfile>/var/run/jabberd/jabberd-sm.pid</pidfile> - -  - <router> -  - <ip>127.0.0.1</ip>  - <port>5347</port>  - -  - <user>jabberd</user>  - <pass>secret</pass>  - -  -  -  - <retry> -  - <init>3</init> - -  - <lost>3</lost> - -  - <sleep>2</sleep> - </retry> - </router> - -  - <log type='syslog'> -  - <ident>jabberd/sm</ident> - -  - <facility>local3</facility> - -  -  - </log> - -  - <storage> -  - <driver>db</driver> - -  -  -  - -  - <mysql> -  - <host>localhost</host> - <port>3306</port> - -  - <dbname>jabberd2</dbname> - -  - <user>jabberd2</user> - <pass>secret</pass> - -  - <transactions/> - </mysql> - -  - <pgsql> -  - <host>localhost</host> - <port>5432</port> - -  - <dbname>jabberd2</dbname> - -  - <user>jabberd2</user> - <pass>secret</pass> - -  - <transactions/> - </pgsql> - -  - <db> -  - <path>/var/lib/jabberd</path> - -  - <sync/> - </db> - </storage> - -  - <aci> -  - <acl type='all'> - <jid>admin@localhost</jid> - </acl> - -  -  - -  -  - -  -  - </aci> - -  - <modules> - -  - <chain id='sess-start'/> - -  - <chain id='sess-end'> - <module>iq-last</module>  - </chain> - -  - <chain id='in-sess'> - <module>validate</module>  - <module>privacy</module>  - <module>roster</module>  - <module>vacation</module>  - <module>iq-vcard</module>  - <module>iq-private</module>  - <module>disco</module>  - <module>offline</module>  - <module>announce</module>  - <module>presence</module>  - <module>deliver</module>  - </chain> - -  - <chain id='out-sess'/> - -  - <chain id='in-router'> - <module>session</module>  - <module>validate</module>  - <module>presence</module>  - <module>privacy</module>  - </chain> - -  - <chain id='out-router'> - <module>privacy</module>  - </chain> - -  - <chain id='pkt-sm'> - <module>iq-last</module>  - <module>iq-time</module>  - <module>iq-version</module>  - <module>disco</module>  - <module>announce</module>  - <module>help</module>  - <module>echo</module>  - </chain> - -  - <chain id='pkt-user'> - <module>roster</module>  - <module>presence</module>  - <module>iq-vcard</module>  - <module>deliver</module>  - <module>vacation</module>  - <module>offline</module>  - <module>disco-publish</module>  - <module>iq-last</module>  - </chain> - -  - <chain id='pkt-router'> - <module>session</module>  - <module>disco</module>  - </chain> - -  - <chain id='user-load'> - <module>active</module>  - <module>roster</module>  - <module>privacy</module>  - <module>disco-publish</module>  - <module>vacation</module>  - </chain> - -  - <chain id='user-create'> - <module>active</module>  - <module>template-roster</module>  - </chain> - -  - <chain id='user-delete'> - <module>active</module>  - <module>announce</module>  - <module>disco-publish</module>  - <module>offline</module>  - <module>privacy</module>  - <module>roster</module>  - <module>vacation</module>  - <module>iq-last</module>  - <module>iq-private</module>  - <module>iq-vcard</module>  - </chain> - - </modules> - -  - <discovery> - -  - <identity> - <category>server</category>  - <type>im</type>  - <name>Jabber IM server</name>  - </identity> - -  - <agents/> - -  - <items> - -  -  - -  -  - - </items> - - </discovery> - -  - <user> -  - <auto-create/> - -  - <template> -  - </template> - </user> - -</sm> diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index ec47d76..82b11c9 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -53,8 +53,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/%{_usr}/sbin mkdir -p $RPM_BUILD_ROOT/%{_usr}/share/rhn/installer install -m 755 -d $RPM_BUILD_ROOT%{defaultdir} -install -m 644 c2s.xml $RPM_BUILD_ROOT%{defaultdir} -install -m 644 sm.xml $RPM_BUILD_ROOT%{defaultdir} install -m 644 cluster.ini $RPM_BUILD_ROOT%{defaultdir} install -m 644 squid.conf $RPM_BUILD_ROOT%{defaultdir} install -m 644 rhn.conf $RPM_BUILD_ROOT%{defaultdir} @@ -72,8 +70,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %dir %{defaultdir} -%{defaultdir}/c2s.xml -%{defaultdir}/sm.xml %{defaultdir}/cluster.ini %{defaultdir}/squid.conf %{defaultdir}/rhn.conf diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 7a55e77..62200d0 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -37,7 +37,7 @@ Requires: %{name}-html %else Requires: spacewalk-proxy-selinux %endif -Requires: jabberd +Requires: jabberd spacewalk-setup-jabberd Requires: httpd Requires: sos Requires(preun): initscripts

1 0

Changes to 'refs/tags/spacewalk-backend-0.9.6-1'
by Michael Mraka 24 Feb '10

24 Feb '10

Tag 'spacewalk-backend-0.9.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-24 15:49 +0000 Tagging package [spacewalk-backend] version [0.9.6-1] in directory [backend/]. Changes since spacewalk-certs-tools-0.9.1-1: Michael Mraka (1): Automatic commit of package [spacewalk-backend] release [0.9.6-1]. --- backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 24 Feb '10

24 Feb '10

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 1a9963be4226deaaa173fd13224508952bb74b90 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Feb 24 16:49:11 2010 +0100 Automatic commit of package [spacewalk-backend] release [0.9.6-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index add2013..80b896e 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.9.5 +Version: 0.9.6 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -622,6 +622,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Wed Feb 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.6-1 +- fixed missing require +- fixed dates in rhn-satellite-exporter + * Tue Feb 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.5-1 - improved spacewalk-repo-sync diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 96fa5d3..255a171 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.9.5-1 backend/ +0.9.6-1 backend/

1 0

Changes to 'refs/tags/spacewalk-certs-tools-0.9.1-1'
by Michael Mraka 24 Feb '10

24 Feb '10

Tag 'spacewalk-certs-tools-0.9.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-24 15:48 +0000 Tagging package [spacewalk-certs-tools] version [0.9.1-1] in directory [spacewalk/certs-tools/]. Changes since spacewalk-backend-0.9.5-1: Michael Mraka (4): don't limit channel list on dates fixed missing require 567271 - fixed import Automatic commit of package [spacewalk-certs-tools] release [0.9.1-1]. Miroslav Suchý (1): 567901 - fix input of user name Tomas Lestach (4): make code more simple 562881 - cobbler system record check 562881 - apidoc fixes 562881 - save cobbler object after setting kickstart variables --- backend/satellite_tools/disk_dumper/iss.py | 12 -- backend/spacewalk-backend.spec | 1 client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchCobblerSystemRecordException.java | 58 ++++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 22 ++- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 24 +++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java | 8 - rel-eng/packages/spacewalk-certs-tools | 2 spacewalk/certs-tools/rhn_bootstrap.py | 2 spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 10 files changed, 103 insertions(+), 35 deletions(-) ---

1 0

3 commits - backend/spacewalk-backend.spec rel-eng/packages spacewalk/certs-tools
by Michael Mraka 24 Feb '10

24 Feb '10

backend/spacewalk-backend.spec | 1 + rel-eng/packages/spacewalk-certs-tools | 2 +- spacewalk/certs-tools/rhn_bootstrap.py | 2 +- spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 9e53a53a5a7187a568ee33ecb44afe039241ef31 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Feb 24 16:48:18 2010 +0100 Automatic commit of package [spacewalk-certs-tools] release [0.9.1-1]. diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools index e8cad58..2c42bb0 100644 --- a/rel-eng/packages/spacewalk-certs-tools +++ b/rel-eng/packages/spacewalk-certs-tools @@ -1 +1 @@ -0.8.7-1 spacewalk/certs-tools/ +0.9.1-1 spacewalk/certs-tools/ diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec index f71ed01..a4c7586 100644 --- a/spacewalk/certs-tools/spacewalk-certs-tools.spec +++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec @@ -2,7 +2,7 @@ Name: spacewalk-certs-tools Summary: Spacewalk SSL Key/Cert Tool Group: Applications/Internet License: GPLv2 and Python -Version: 0.9.0 +Version: 0.9.1 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_var}/www/html/pub/bootstrap/client_config_update.py* %changelog +* Wed Feb 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.1-1 +- 567271 - fixed import + * Thu Feb 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.7-1 - updated copyrights commit 9376d665b4d52ce835b1b1f4646c1a0cf895f4ae Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Feb 24 16:43:29 2010 +0100 567271 - fixed import diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py index b0fe620..14be341 100644 --- a/spacewalk/certs-tools/rhn_bootstrap.py +++ b/spacewalk/certs-tools/rhn_bootstrap.py @@ -34,7 +34,7 @@ import operator from optparse import Option, OptionParser ## local imports -from rhn.common import rhn_rpm +from spacewalk.common import rhn_rpm from client_config_update import readConfigFile from rhn_bootstrap_strings import \ getHeader, getConfigFilesSh, getUp2dateScriptsSh, getGPGKeyImportSh, \ commit 53aa0764fb0f7cdfb4559be224b351baf4fa6ad4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Feb 24 16:41:38 2010 +0100 fixed missing require diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 9939cf0..add2013 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -151,6 +151,7 @@ This package contains listener for the Server XML dumper. Summary: Spacewalk server and client tools libraries Group: Applications/Internet BuildRequires: python-devel +Requires: python-hashlib %description libs Libraries required by both Spacewalk server and Spacewalk client tools.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2010