java/code java/conf java/spacewalk-java.spec
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 8 ++------
java/conf/cobbler/snippets/default_motd | 2 ++
java/spacewalk-java.spec | 2 ++
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f47ed24770fe7e2d8dc5fd3393b6c7faddc269c9
Author: Mario Schugowski <mario(a)mediatronix.de>
Date: Thu Mar 3 10:46:25 2011 +0100
678519 - moving MOTD into a separate kickstart snippent
drawback: /etc/motd doesn't contain product name any more
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index b261c92..0aa0f75 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -63,6 +63,7 @@ public class KickstartFormatter {
private static final String POST_DELETION_SNIPPET =
"spacewalk/post_delete_system";
private static final String KEEP_SYSTEM_ID_SNIPPET = "spacewalk/keep_system_id";
+ private static final String DEFAULT_MOTD = "spacewalk/default_motd";
private static final String RAW_START = "#raw";
private static final String RAW_END = "#end raw";
@@ -79,11 +80,6 @@ public class KickstartFormatter {
Config.get().getString("web.product_name") + " Config Management" +
NEWLINE;
private static final String COMMENT = "#" + NEWLINE;
- private static final String MOTD_FOOTER = "# MOTD" + NEWLINE + "echo >> /etc/motd" +
- NEWLINE + "echo \"" + Config.get().getString("web.product_name") +
- " kickstart on \\$(date +'%Y-%m-%d')\" >> /etc/motd" +
- NEWLINE + "echo >> /etc/motd" + NEWLINE + NEWLINE +
- "# end of generated kickstart file";
private static final String BEGINRHN = "%post --logfile " +
"/root/ks-rhn-post.log" + NEWLINE +
"# --Begin " + Config.get().getString("web.product_name") +
@@ -266,7 +262,6 @@ public class KickstartFormatter {
buf.append(NEWLINE);
addCobblerSnippet(buf, "post_install_kernel_options");
addCobblerSnippet(buf, "koan_environment");
- buf.append(MOTD_FOOTER);
buf.append(NEWLINE);
buf.append("$kickstart_done");
buf.append(NEWLINE);
@@ -677,6 +672,7 @@ public class KickstartFormatter {
retval.append("/etc/init.d/haldaemon restart" + NEWLINE);
}
retval.append("# begin cobbler snippet" + NEWLINE);
+ addCobblerSnippet(retval, DEFAULT_MOTD);
addCobblerSnippet(retval, REDHAT_REGISTER_SNIPPET);
retval.append("# end cobbler snippet" + NEWLINE);
diff --git a/java/conf/cobbler/snippets/default_motd b/java/conf/cobbler/snippets/default_motd
new file mode 100644
index 0000000..4f2b77b
--- /dev/null
+++ b/java/conf/cobbler/snippets/default_motd
@@ -0,0 +1,2 @@
+# set default MOTD
+echo "Kickstarted on \$(date +'%Y-%m-%d')" >> /etc/motd
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b0cd73b..59477ac 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -345,6 +345,7 @@ install -m 755 scripts/taskomatic $RPM_BUILD_ROOT%{_initrddir}
install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT%{_datadir}/rhn/classes/log4j.properties
+install -m 644 conf/cobbler/snippets/default_motd $RPM_BUILD_ROOT%{cobdirsnippets}/default_motd
install -m 644 conf/cobbler/snippets/keep_system_id $RPM_BUILD_ROOT%{cobdirsnippets}/keep_system_id
install -m 644 conf/cobbler/snippets/post_reactivation_key $RPM_BUILD_ROOT%{cobdirsnippets}/post_reactivation_key
install -m 644 conf/cobbler/snippets/post_delete_system $RPM_BUILD_ROOT%{cobdirsnippets}/post_delete_system
@@ -497,6 +498,7 @@ fi
%dir %{cobprofdirup}
%dir %{cobprofdirwiz}
%dir %{cobdirsnippets}
+%config %{cobdirsnippets}/default_motd
%config %{cobdirsnippets}/keep_system_id
%config %{cobdirsnippets}/post_reactivation_key
%config %{cobdirsnippets}/post_delete_system
13 years
Changes to 'refs/tags/spacewalk-java-1.5.24-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:35 +0000
Tagging package [spacewalk-java] version [1.5.24-1] in directory [java/].
Changes since spacewalk-proxy-1.5.4-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.24-1].
---
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit f8035159b720a8b00faebdf06e84762d231d2dc7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:35:20 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.24-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5159d88..b0cd73b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.23
+Version: 1.5.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.24-1
+- 638571 - set correctly the Channels column (tlestach(a)redhat.com)
+- 636614 - mark system_groups of org.listOrgs API as optional
+ (tlestach(a)redhat.com)
+- 636614 - fix system_groups for org.listOrgs API (tlestach(a)redhat.com)
+- 703064 - changing WebUI message (tlestach(a)redhat.com)
+- 659138 - fix button submit detection (tlestach(a)redhat.com)
+- 659138 - schedule description strings update (tlestach(a)redhat.com)
+
* Mon May 09 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.23-1
- 659138 - change runs ordering (tlestach(a)redhat.com)
- 659138 - first schedule, then display (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 55922a3..a1ed7c6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.23-1 java/
+1.5.24-1 java/
13 years
Changes to 'refs/tags/spacewalk-proxy-1.5.4-1'
by Jan Pazdziora
Tag 'spacewalk-proxy-1.5.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:34 +0000
Tagging package [spacewalk-proxy] version [1.5.4-1] in directory [proxy/proxy/].
Changes since spacewalk-web-1.5.8-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-proxy] release [1.5.4-1].
---
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
proxy/proxy rel-eng/packages
by Jan Pazdziora
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 19faf70ecf4b6772c022f01dec677367c3df638e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:34:56 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.4-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index b969419..14c3ed6 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.4-1
+- 678053 - add option --no-session-caching to rhn_package_manager
+ (msuchy(a)redhat.com)
+
* Wed May 04 2011 Miroslav Suchý 1.5.3-1
- do not import modules through magic
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index eb19afc..2cf9ea5 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.3-1 proxy/proxy/
+1.5.4-1 proxy/proxy/
13 years
Changes to 'refs/tags/spacewalk-web-1.5.8-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:34 +0000
Tagging package [spacewalk-web] version [1.5.8-1] in directory [web/].
Changes since spacewalk-selinux-1.5.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.8-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3686623550ffb98a1d307e75a45c83b2b4437c70
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:34:33 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 7968d4d..67d3476 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.7-1 web/
+1.5.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 266ce85..32230ef 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.7
+Version: 1.5.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.8-1
+- Fix remote command schedule date on postgresql (Ville.Salmela(a)csc.fi)
+
* Fri May 06 2011 Jan Pazdziora 1.5.7-1
- Fix remote commands on Spacewalk 1.4 and PostgreSQL (Ville.Salmela(a)csc.fi)
13 years
Changes to 'refs/tags/spacewalk-selinux-1.5.2-1'
by Jan Pazdziora
Tag 'spacewalk-selinux-1.5.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:34 +0000
Tagging package [spacewalk-selinux] version [1.5.2-1] in directory [selinux/spacewalk-selinux/].
Changes since spacewalk-selinux-1.5.1-1:
Jan Pazdziora (2):
634989 - allow Apache to send emails, useful when mod_python/mod_perl is about to send traceback.
Automatic commit of package [spacewalk-selinux] release [1.5.2-1].
---
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux-enable | 1 +
selinux/spacewalk-selinux/spacewalk-selinux.spec | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages selinux/spacewalk-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 437100c8f476bd6bfd8b3c975dd346aae63d0f5a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:34:05 2011 +0200
Automatic commit of package [spacewalk-selinux] release [1.5.2-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 4067a17..0da3cf8 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.5.1-1 selinux/spacewalk-selinux/
+1.5.2-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index ab84164..4ced6a4 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk
Name: spacewalk-selinux
-Version: 1.5.1
+Version: 1.5.2
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
@@ -113,6 +113,10 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.2-1
+- 634989 - allow Apache to send emails, useful when mod_python/mod_perl is
+ about to send traceback.
+
* Tue May 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.1-1
- 702274 - restore kickstart files context
- 702274 - fixed context of kickstart configs
13 years