schema/spacewalk
by Pradeep Kilambi
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 059e1d21e9ca2b155987b59c35664a92ed57f65a
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Tue Aug 4 12:28:54 2009 -0400
being cautious
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
index 96db2cc..ceb0bd8 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
@@ -6,7 +6,9 @@ CONSTRAINT rhn_channel_checksum_fk
-- Update any existing channels that are not set
UPDATE rhnChannel SET
- checksum_type_id = 2
+ checksum_type_id = (select id
+ from rhnChecksumType
+ where LABEL = 'sha1')
WHERE checksum_type_id is null;
show errors
14 years, 8 months
2 commits - schema/spacewalk
by Pradeep Kilambi
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 88313c2ae962e9ee522dc5596cf22f74b2ef3ff4
Merge: 2a5376d... 7f8a646...
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Tue Aug 4 12:19:13 2009 -0400
Merge branch 'master' of ssh://pkilambi@git.fedorahosted.org/git/spacewalk
commit 2a5376d180e07f3a3566e24a2fffc7e7051e2af3
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Tue Aug 4 12:19:05 2009 -0400
Fixing the upgrades to default to sha1 for already existing channels
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
index 8842689..96db2cc 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
@@ -4,4 +4,9 @@ ALTER TABLE rhnChannel
CONSTRAINT rhn_channel_checksum_fk
REFERENCES rhnChecksumType(id);
+-- Update any existing channels that are not set
+UPDATE rhnChannel SET
+ checksum_type_id = 2
+WHERE checksum_type_id is null;
+
show errors
14 years, 8 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 6 ++++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 7f8a6467f3d94afef52cf6aa3b1bd203ea68209c
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Aug 4 11:04:20 2009 -0400
514800 - added logic to check for channel managers per cid
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index f243950..22e796e 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -185,7 +185,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
rhnChannelCloned c_1_
WHERE c.id = :cid
AND c.id = c_1_.id (+)
- AND rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1]]>
+ AND (rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1 OR
+ rhn_channel.user_role_check(c.id, :userId, 'manage') = 1) ]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
@@ -195,7 +196,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
rhnChannelCloned c_1_
WHERE c.label = :label
AND c.id = c_1_.id (+)
- AND rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1]]>
+ AND (rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1 OR
+ rhn_channel.user_role_check(c.id, :userId, 'manage') = 1) ]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
index 54d782d..0fd20cf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
+import com.redhat.rhn.manager.user.UserManager;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -48,7 +49,8 @@ public class ChannelPackageMenuAction extends RhnAction {
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
ChannelFactory.lookupByLabelAndUser(chan.getLabel(), user);
- if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) {
+ if (!user.hasRole(RoleFactory.CHANNEL_ADMIN) &&
+ !UserManager.verifyChannelAdmin(user, chan)) {
throw new PermissionCheckFailureException(RoleFactory.CHANNEL_ADMIN);
}
14 years, 8 months
Branch 'VADER' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 6 ++++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 732deae8f696aa8539b591b6a60d17eec8f912d6
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Aug 4 11:04:20 2009 -0400
514800 - added logic to check for channel managers per cid
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index f4ecff3..425bccd 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -172,7 +172,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
rhnChannelCloned c_1_
WHERE c.id = :cid
AND c.id = c_1_.id (+)
- AND rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1]]>
+ AND (rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1 OR
+ rhn_channel.user_role_check(c.id, :userId, 'manage') = 1) ]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
@@ -182,7 +183,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
rhnChannelCloned c_1_
WHERE c.label = :label
AND c.id = c_1_.id (+)
- AND rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1]]>
+ AND (rhn_channel.user_role_check(c.id, :userId, 'subscribe') = 1 OR
+ rhn_channel.user_role_check(c.id, :userId, 'manage') = 1) ]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
index 54d782d..0fd20cf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
+import com.redhat.rhn.manager.user.UserManager;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -48,7 +49,8 @@ public class ChannelPackageMenuAction extends RhnAction {
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
ChannelFactory.lookupByLabelAndUser(chan.getLabel(), user);
- if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) {
+ if (!user.hasRole(RoleFactory.CHANNEL_ADMIN) &&
+ !UserManager.verifyChannelAdmin(user, chan)) {
throw new PermissionCheckFailureException(RoleFactory.CHANNEL_ADMIN);
}
14 years, 8 months
Branch 'VADER' - backend/satellite_tools
by Pradeep Kilambi
backend/satellite_tools/disk_dumper/iss_actions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 91ac95ce430d6ed82b92e418e33bb001b4ba6101
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Fri Jun 19 18:18:54 2009 -0400
remove short package dependency on rpms. User might wanna skip the rpms and still import metadata.
diff --git a/backend/satellite_tools/disk_dumper/iss_actions.py b/backend/satellite_tools/disk_dumper/iss_actions.py
index 2897ee3..6b5632a 100644
--- a/backend/satellite_tools/disk_dumper/iss_actions.py
+++ b/backend/satellite_tools/disk_dumper/iss_actions.py
@@ -23,7 +23,7 @@ class ActionDeps:
'source-packages' : [''],
'errata' : [''],
'kickstarts' : [''],
- 'rpms' : ['short'],
+ 'rpms' : [''],
# 'srpms' : ['channels'],
'channels' : ['channel-families'],
'channel-families' : ['blacklists'],
14 years, 8 months
Changes to 'refs/tags/spacewalk-setup-0.6.18-1'
by Jan Pazdziora
Tag 'spacewalk-setup-0.6.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-08-04 11:50 +0000
Tagging package [spacewalk-setup] version [0.6.18-1] in directory [spacewalk/setup/].
Changes since spacewalk-web-0.6.17-1:
Jan Pazdziora (4):
490668 - generate spacewalk-setup man page from Spacewalk::Setup.
490668 - update man page to say both Spacewalk::Setup and spacewalk-setup.
490668 - add man page for cobbler-setup.
Automatic commit of package [spacewalk-setup] release [0.6.18-1].
Miroslav Suchý (2):
run builds only once - tito build it for all arch, no need to run it for every tag
do not build heirloom-pkgtools in nightly
---
rel-eng/build-missing-builds-in-koji.sh | 24 ++++++++---------
rel-eng/packages/spacewalk-setup | 2 -
spacewalk/setup/Makefile.PL | 3 ++
spacewalk/setup/bin/cobbler-setup | 43 ++++++++++++++++++++++++++++++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 6 ----
spacewalk/setup/spacewalk-setup.spec | 5 ++-
6 files changed, 64 insertions(+), 19 deletions(-)
---
14 years, 8 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 704c87e625e89d881a2a3332b6a8f1f18ddb16e9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 13:50:59 2009 +0200
Automatic commit of package [spacewalk-setup] release [0.6.18-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index c85585b..cee7d6e 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.6.17-1 spacewalk/setup/
+0.6.18-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 2a92fd7..3df382e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.6.17
+Version: 0.6.18
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Tue Aug 04 2009 Jan Pazdziora 0.6.18-1
+- 490668 - add man pages for spacewalk-setup and cobbler-setup
+
* Mon Aug 03 2009 Jan Pazdziora 0.6.17-1
- No --log option, print_progress does logging for us, sqlplus should print to
STDOUT/STDERR
14 years, 8 months
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/Makefile.PL | 4 ++-
spacewalk/setup/bin/cobbler-setup | 43 ++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit 1be7cfebc07500e387a1a386248ed746e2619441
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 13:44:34 2009 +0200
490668 - add man page for cobbler-setup.
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index 78d318e..1197771 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -12,7 +12,9 @@ WriteMakefile(
PREREQ_PM => {
'Test::More' => 0,
},
- MAN1PODS => { 'lib/Spacewalk/Setup.pm' => '$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)' },
+ MAN1PODS => { 'lib/Spacewalk/Setup.pm' => '$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)',
+ 'bin/cobbler-setup' => '$(INST_MAN1DIR)/cobbler-setup.$(MAN1EXT)',
+ },
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'Spacewalk-Setup-*' },
);
diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobbler-setup
index a08b6f3..0d7e3b2 100755
--- a/spacewalk/setup/bin/cobbler-setup
+++ b/spacewalk/setup/bin/cobbler-setup
@@ -91,3 +91,46 @@ def main():
if __name__=="__main__":
main()
+
+
+"""
+
+=head1 NAME
+
+cobbler-setup
+
+=head1 SYNOPSIS
+
+ cobbler-setup
+ cobbler-setup --enable-tftp=yes
+
+=head1 DESCRIPTION
+
+The B<cobbler-setup> program generates configuration files for cobbler
+in F</etc/cobbler>, based on templates in
+F</usr/share/cobbler/installer_templates>. It also offers to enable
+services needed for PXT (B<xinetd> and B<tftp>), unless
+prevented with B<--enable-tftp=no>.
+
+The tool is generally called automatically by Spacewalk's
+B<spacewalk-setup>.
+
+=head1 OPTIONS
+
+=over 4
+
+=item --enable-tftp=yes, --enable-tftp=no
+
+This option prevents B<cobbler-setup> from asking whether to setup the
+B<xinetd> and B<tftp> services. With B<yes>, the action will be done,
+with B<no> it will not.
+
+=back
+
+=head1 SEE ALSO
+
+spacewalk-setup(1)
+
+=cut
+
+"""
14 years, 8 months
2 commits - spacewalk/setup
by Jan Pazdziora
spacewalk/setup/Makefile.PL | 1 +
spacewalk/setup/lib/Spacewalk/Setup.pm | 6 +-----
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit d692844c6cc8378e3409bd21912f28cff2aee574
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 13:30:13 2009 +0200
490668 - update man page to say both Spacewalk::Setup and spacewalk-setup.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index ed86b8e..b617267 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -22,7 +22,7 @@ Params::Validate::validation_options(strip_leading => "-");
=head1 NAME
-Spacewalk::Setup
+Spacewalk::Setup, spacewalk-setup
=head1 VERSION
@@ -1433,10 +1433,6 @@ sub generate_server_pem {
}
-=head1 NAME
-
-Spacewalk::Setup
-
=head1 DESCRIPTION
Spacewalk::Setup is a module which provides the guts of the
commit 4559d17614161a64df52d1f1253c57b2d07c27c7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 13:23:44 2009 +0200
490668 - generate spacewalk-setup man page from Spacewalk::Setup.
diff --git a/spacewalk/setup/Makefile.PL b/spacewalk/setup/Makefile.PL
index dc65a18..78d318e 100644
--- a/spacewalk/setup/Makefile.PL
+++ b/spacewalk/setup/Makefile.PL
@@ -12,6 +12,7 @@ WriteMakefile(
PREREQ_PM => {
'Test::More' => 0,
},
+ MAN1PODS => { 'lib/Spacewalk/Setup.pm' => '$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)' },
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'Spacewalk-Setup-*' },
);
14 years, 8 months
2 commits - rel-eng/build-missing-builds-in-koji.sh
by Miroslav Suchý
rel-eng/build-missing-builds-in-koji.sh | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 0de6c34bf3f89d611357d453da557fa56c6a48d9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 4 10:36:25 2009 +0200
do not build heirloom-pkgtools in nightly
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh
index 8718934..eeb3644 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -11,7 +11,7 @@ export PYTHONUNBUFFERED=1
for tag in 0 1 2; do
rel-eng/koji-missing-builds.py --no-extra ${TAGS[$tag]} | \
- awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/) {
+ awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/ || /heirloom-pkgtools/) {
if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*", "\\1", "g")}
}
/Builds missing in koji/ { x=1 }' | \
commit d6276ea4ab79bd2a92a10876ce3f2c91b4083f66
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 4 10:30:14 2009 +0200
run builds only once - tito build it for all arch, no need to run it for every tag
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh
index 215d59e..8718934 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-TAGS=([0]="dist-5E-sw-0.6-candidate" [1]="dist-f10-sw-0.6-candidate")
+TAGS=([0]="dist-5E-sw-0.6-candidate" [1]="dist-f10-sw-0.6-candidate" [2]="dist-f11-sw-0.6-candidate")
pushd `pwd`
@@ -9,22 +9,22 @@ cd `dirname $0`/..
# say python to be nice to pipe
export PYTHONUNBUFFERED=1
-for tag in 0 1; do
+for tag in 0 1 2; do
rel-eng/koji-missing-builds.py --no-extra ${TAGS[$tag]} | \
awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/) {
if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*", "\\1", "g")}
}
/Builds missing in koji/ { x=1 }' | \
xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring | \
- grep -v solaris | \
- while read package ; do
- (
- echo Building package in path $package
- cd $package && ${TITO_PATH}tito build --koji-release | \
- awk '/Wrote:.*tar.gz/ {print $2}' | \
- xargs -I packagepath scp packagepath fedorahosted.org:spacewalk
- )
- done
+ grep -v solaris
+done | sort | uniq | \
+while read package ; do
+ (
+ echo Building package in path $package
+ cd $package && ${TITO_PATH}tito build --koji-release | \
+ awk '/Wrote:.*tar.gz/ {print $2}' | \
+ xargs -I packagepath scp packagepath fedorahosted.org:spacewalk
+ )
done
popd
14 years, 8 months