2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/Action.pm | 44 +++++++++++----------------------------
web/spacewalk-web.spec | 5 +++-
3 files changed, 18 insertions(+), 33 deletions(-)
New commits:
commit 3b491d215cad33a41a05883390d37c63920bed00
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 15:26:07 2011 +0100
Automatic commit of package [spacewalk-web] release [1.6.29-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index f51809d..782407e 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.28-1 web/
+1.6.29-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index ba09fcf..60842e7 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.28
+Version: 1.6.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 1.6.29-1
+- Fixing cancel a scheduled action on a server.
+
* Wed Nov 16 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.28-1
- 754379 - fix deletion-url in pxt pages (tlestach(a)redhat.com)
commit 91b2ab3bcb08aa0d051f04b72d43f81f29009c71
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 21 11:16:12 2011 +0100
Fixing cancel a scheduled action on a server.
Based on Greg W.'s patch.
diff --git a/web/modules/rhn/RHN/DB/Action.pm b/web/modules/rhn/RHN/DB/Action.pm
index fe101f6..8dcb88c 100644
--- a/web/modules/rhn/RHN/DB/Action.pm
+++ b/web/modules/rhn/RHN/DB/Action.pm
@@ -168,9 +168,6 @@ sub cancel_pending_for_system {
my $dbh = $params{transaction} || RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
-DECLARE
-
-cursor pending_actions is
SELECT A.id
FROM rhnAction A,
rhnServerAction SA
@@ -178,18 +175,15 @@ SELECT A.id
AND SA.status = 0
AND SA.action_id = A.id
AND A.prerequisite IS NULL
-ORDER BY A.id;
-
-BEGIN
-
-for action in pending_actions loop
- rhn_server.remove_action(:server_id, action.id);
-end loop;
-END;
+ORDER BY A.id
EOQ
$sth->execute_h(server_id => $params{server_id});
+ while (my @results = $sth->fetchrow()) {
+ $dbh->call_procedure('rhn_server.remove_action', $params{server_id}, $results[0]);
+ }
+
if (defined $params{transaction}) {
return $params{transaction};
}
@@ -207,12 +201,7 @@ sub delete_set_from_action {
my $dbh = RHN::DB->connect;
-
-
my $query = <<EOQ;
-DECLARE
-
-cursor selected_servers is
SELECT SA.server_id
FROM rhnServerAction SA, rhnSet ST
WHERE ST.user_id = :user_id
@@ -220,16 +209,13 @@ SELECT SA.server_id
AND ST.element = SA.server_id
AND SA.action_id = :action_id
AND SA.status = 0;
-
-BEGIN
-for server in selected_servers loop
- rhn_server.remove_action(server.server_id, :action_id);
-end loop;
-END;
EOQ
my $sth = $dbh->prepare($query);
$sth->execute_h(action_id => $aid, user_id => $uid, label => $set_name);
+ while (my @results = $sth->fetchrow()) {
+ $dbh->call_procedure('rhn_server.remove_action', $results[0], $aid);
+ }
$dbh->commit;
}
@@ -242,9 +228,6 @@ sub delete_system_from_action_set {
my $dbh = RHN::DB->connect;
my $query = <<EOQ;
-DECLARE
-
-cursor selected_actions is
SELECT SA.action_id
FROM rhnSet ST, rhnServerAction SA
WHERE ST.user_id = :user_id
@@ -252,16 +235,15 @@ SELECT SA.action_id
AND SA.server_id = :server_id
AND ST.element = SA.action_id
AND SA.status = 0;
-
-BEGIN
-for action in selected_actions loop
- rhn_server.remove_action(:server_id, action.action_id);
-end loop;
-END;
EOQ
my $sth = $dbh->prepare($query);
$sth->execute_h(server_id => $sid, user_id => $uid, label => $set_name);
+
+ while (my @results = $sth->fetchrow()) {
+ $dbh->call_procedure('rhn_server.remove_action', $sid, $results[0]);
+ }
+
$dbh->commit;
}
12 years, 5 months
2 commits - rel-eng/build-missing-builds-in-koji.sh rel-eng/koji-missing-builds.py rel-eng/releasers.conf rel-eng/tito.props
by Jan Pazdziora
rel-eng/build-missing-builds-in-koji.sh | 2 +-
rel-eng/koji-missing-builds.py | 3 ++-
rel-eng/releasers.conf | 2 +-
rel-eng/tito.props | 6 +++++-
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 099b39274f665a1bbad38d67057e311ab344d98a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 15:17:20 2011 +0100
Enable also building on Fedora 16.
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh
index e0f63f2..32870a4 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -6,7 +6,7 @@ if [ "$(basename $0)" == "build-missing-builds-in-brew.sh" ] ; then
KOJI_MISSING_BUILD_BREW_ARG="--brew"
TITO_BUILD_ARG="--cvs-release"
else
- TAGS="dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate"
+ TAGS="dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate"
TITO_BUILD_ARG="--release"
FEDORA_UPLOAD=1
fi
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
index c23ed3a..a7f1601 100644
--- a/rel-eng/releasers.conf
+++ b/rel-eng/releasers.conf
@@ -1,4 +1,4 @@
[koji]
releaser = tito.release.KojiGitReleaser
-autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate
+autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate
git_url = git://git.fedorahosted.org/git/spacewalk.git
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 67cf652..6b10a21 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -6,7 +6,7 @@ changelog_do_not_remove_cherrypick = 0
lib_dir = rel-eng/lib
[koji]
-autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate
+autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate
[dist-5E-sw-1.6-candidate]
disttag = .el5
commit f87aa20ec300c979a7acdbe01e6b0aa31425c455
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 14:00:36 2011 +0100
Prepare the Fedora 16 tito target.
diff --git a/rel-eng/koji-missing-builds.py b/rel-eng/koji-missing-builds.py
index f052ab7..bc4a57a 100755
--- a/rel-eng/koji-missing-builds.py
+++ b/rel-eng/koji-missing-builds.py
@@ -40,7 +40,8 @@ distmap = {'6E':'.el6',
'f12':'.fc12',
'f13':'.fc13',
'f14':'.fc14',
- 'f15':'.fc15'}
+ 'f15':'.fc15',
+ 'f16':'.fc16'}
distsuffix = ''
tag = args[0]
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 5ed40cd..67cf652 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -23,3 +23,7 @@ blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient sm
[dist-f15-sw-1.6-candidate]
disttag = .fc15
blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux
+
+[dist-f16-sw-1.6-candidate]
+disttag = .fc16
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux
12 years, 5 months
rel-eng/comps rel-eng/tito.props
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 1 -
rel-eng/comps/comps-spacewalk-server-fedora15.xml | 1 -
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 -
rel-eng/tito.props | 4 ++--
4 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 65ec03cd5c6c17ed2a6bde38a66cd9e5f59718a8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 13:53:32 2011 +0100
The Satellite is RHEL-only product, blacklist oracle-rhnsat-selinux on Fedoras.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora14.xml b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
index fe0d2ea..4fc3c1e 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora14.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
@@ -156,7 +156,6 @@
<description>Spacewalk Server Non-installatble Packages</description>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">oracle-rhnsat-selinux</packagereq>
<packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
</packagelist>
</group>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora15.xml b/rel-eng/comps/comps-spacewalk-server-fedora15.xml
index fe0d2ea..4fc3c1e 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora15.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora15.xml
@@ -156,7 +156,6 @@
<description>Spacewalk Server Non-installatble Packages</description>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">oracle-rhnsat-selinux</packagereq>
<packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
</packagelist>
</group>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index fe0d2ea..4fc3c1e 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -156,7 +156,6 @@
<description>Spacewalk Server Non-installatble Packages</description>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">oracle-rhnsat-selinux</packagereq>
<packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
</packagelist>
</group>
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index f994a1f..5ed40cd 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -18,8 +18,8 @@ blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-p
[dist-f14-sw-1.6-candidate]
disttag = .fc14
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux
[dist-f15-sw-1.6-candidate]
disttag = .fc15
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux
12 years, 5 months
Changes to 'refs/tags/oracle-selinux-0.1.23.32-1'
by Jan Pazdziora
Tag 'oracle-selinux-0.1.23.32-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-23 12:34 +0000
Tagging package [oracle-selinux] version [0.1.23.32-1] in directory [selinux/oracle-selinux/].
Changes since nocpulse-common-2.2.1-1:
Jan Pazdziora (2):
Require the roles.
Automatic commit of package [oracle-selinux] release [0.1.23.32-1].
---
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
selinux/oracle-selinux/oracle.te | 8 ++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
---
12 years, 5 months
rel-eng/packages selinux/oracle-selinux
by Jan Pazdziora
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b4fab975aa2e2204ef1faf8f7cce9cae7ce3264f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 13:34:58 2011 +0100
Automatic commit of package [oracle-selinux] release [0.1.23.32-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index da04901..c14ac99 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1.23.31-1 selinux/oracle-selinux/
+0.1.23.32-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 258e7d4..029b84e 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -19,7 +19,7 @@
%endif
Name: oracle-selinux
-Version: 0.1.23.31
+Version: 0.1.23.32
Release: 1%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -222,6 +222,9 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 0.1.23.32-1
+- Require the roles.
+
* Fri Jul 22 2011 Jan Pazdziora 0.1.23.31-1
- We only support version 14 and newer of Fedora, removing conditions for old
versions.
12 years, 5 months
selinux/oracle-selinux
by Jan Pazdziora
selinux/oracle-selinux/oracle.te | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit aaa4db901753b5dbf3697e1873e617d12b91dae9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 13:05:36 2011 +0100
Require the roles.
Addressing Fedora 16 build error
oracle.te":68:ERROR 'unknown role sysadm_r' at token ';' on line 12534:
role sysadm_r types oracle_db_t;
diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/oracle.te
index 5d220b6..51ac7a5 100644
--- a/selinux/oracle-selinux/oracle.te
+++ b/selinux/oracle-selinux/oracle.te
@@ -64,6 +64,11 @@ optional_policy(`
')
# TODO: create dba role
+gen_require(`
+ role staff_r;
+ role system_r;
+ role sysadm_r;
+')
oracle_management_role(staff_r)
oracle_management_role(system_r)
oracle_management_role(sysadm_r)
@@ -198,6 +203,9 @@ tunable_policy(`oracle_11g_support',`
allow oracle_tnslsnr_t self:process execstack;
')
+gen_require(`
+ role unconfined_r;
+')
role unconfined_r types oracle_sqlplus_t;
role unconfined_r types oracle_lsnrctl_t;
role unconfined_r types oracle_tnslsnr_t;
12 years, 5 months
Changes to 'refs/tags/nocpulse-common-2.2.1-1'
by Miroslav Suchý
Tag 'nocpulse-common-2.2.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-22 16:05 +0000
Tagging package [nocpulse-common] version [2.2.1-1] in directory [monitoring/nocpulse-common/].
Changes since rhn-client-tools-1.6.36-1:
Miroslav Suchý (3):
755963 - logrotate nocpulse even on Fedora 16
bump up version
Automatic commit of package [nocpulse-common] release [2.2.1-1].
---
monitoring/nocpulse-common/nocpulse-common.spec | 14 +++++++++++---
monitoring/nocpulse-common/nocpulse.logrotate | 12 ------------
monitoring/nocpulse-common/nocpulse.logrotate.new | 13 +++++++++++++
monitoring/nocpulse-common/nocpulse.logrotate.old | 12 ++++++++++++
rel-eng/packages/nocpulse-common | 2 +-
5 files changed, 37 insertions(+), 16 deletions(-)
---
12 years, 5 months
3 commits - monitoring/nocpulse-common rel-eng/packages
by Miroslav Suchý
monitoring/nocpulse-common/nocpulse-common.spec | 14 +++++++++++---
monitoring/nocpulse-common/nocpulse.logrotate | 12 ------------
monitoring/nocpulse-common/nocpulse.logrotate.new | 13 +++++++++++++
monitoring/nocpulse-common/nocpulse.logrotate.old | 12 ++++++++++++
rel-eng/packages/nocpulse-common | 2 +-
5 files changed, 37 insertions(+), 16 deletions(-)
New commits:
commit 2c872379f3a73b09f5d0a51215b6b26b8fecadb9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 17:05:43 2011 +0100
Automatic commit of package [nocpulse-common] release [2.2.1-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 784e5d4..8743055 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,5 +1,5 @@
Name: nocpulse-common
-Version: 2.2.0
+Version: 2.2.1
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
@@ -150,6 +150,10 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 22 2011 Miroslav Suchý 2.2.1-1
+- bump up version
+- 755963 - logrotate nocpulse even on Fedora 16
+
* Thu Jun 02 2011 Miroslav Suchý 2.1.24-1
- 710002 - create initial NOCpulse.ini on correct place
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common
index 7af1b79..3a420f6 100644
--- a/rel-eng/packages/nocpulse-common
+++ b/rel-eng/packages/nocpulse-common
@@ -1 +1 @@
-2.1.24-1 monitoring/nocpulse-common/
+2.2.1-1 monitoring/nocpulse-common/
commit 130d7eeec8800a53416dd08872c4e76097eaff54
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 17:05:30 2011 +0100
bump up version
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 45b3e32..784e5d4 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,5 +1,5 @@
Name: nocpulse-common
-Version: 2.1.24
+Version: 2.2.0
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
commit 0c53a3a3d6a98049556d44d6805eebc5a3b85a2d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 17:03:28 2011 +0100
755963 - logrotate nocpulse even on Fedora 16
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 340cbe3..45b3e32 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -48,9 +48,13 @@ mkdir -p %{buildroot}%{_var}/lib/%{package_name}/.ssh
# install log rotation stuff
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m644 nocpulse.logrotate \
+%if 0%{?fedora} && 0%{?fedora} >= 16
+install -m644 nocpulse.logrotate.new \
$RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-
+%else
+install -m644 nocpulse.logrotate.old \
+ $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+%endif
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
install -m644 NOCpulse.ini $RPM_BUILD_ROOT/%{_sysconfdir}/NOCpulse.ini
install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{package_name}/NOCpulse/tmp
diff --git a/monitoring/nocpulse-common/nocpulse.logrotate b/monitoring/nocpulse-common/nocpulse.logrotate
deleted file mode 100644
index 6317a86..0000000
--- a/monitoring/nocpulse-common/nocpulse.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/nocpulse/*log {
- missingok
- notifempty
- rotate 5
- compress
- sharedscripts
- postrotate
- /sbin/service Monitoring restart < /dev/null >/dev/null 2>/dev/null || true
- /sbin/service MonitoringScout restart < /dev/null >/dev/null 2>/dev/null || true
- endscript
-}
-
diff --git a/monitoring/nocpulse-common/nocpulse.logrotate.new b/monitoring/nocpulse-common/nocpulse.logrotate.new
new file mode 100644
index 0000000..3563416
--- /dev/null
+++ b/monitoring/nocpulse-common/nocpulse.logrotate.new
@@ -0,0 +1,13 @@
+/var/log/nocpulse/*log {
+ missingok
+ notifempty
+ rotate 5
+ compress
+ sharedscripts
+ su nocpulse apache
+ postrotate
+ /sbin/service Monitoring restart < /dev/null >/dev/null 2>/dev/null || true
+ /sbin/service MonitoringScout restart < /dev/null >/dev/null 2>/dev/null || true
+ endscript
+}
+
diff --git a/monitoring/nocpulse-common/nocpulse.logrotate.old b/monitoring/nocpulse-common/nocpulse.logrotate.old
new file mode 100644
index 0000000..6317a86
--- /dev/null
+++ b/monitoring/nocpulse-common/nocpulse.logrotate.old
@@ -0,0 +1,12 @@
+/var/log/nocpulse/*log {
+ missingok
+ notifempty
+ rotate 5
+ compress
+ sharedscripts
+ postrotate
+ /sbin/service Monitoring restart < /dev/null >/dev/null 2>/dev/null || true
+ /sbin/service MonitoringScout restart < /dev/null >/dev/null 2>/dev/null || true
+ endscript
+}
+
12 years, 5 months
Branch 'ipv6' - backend/server
by Miroslav Suchý
backend/server/rhnServer/server_hardware.py | 39 +++++++++++++---------------
1 file changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 10255c79b92eb970d8d3866f337ecde130584c88
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 15:16:38 2011 +0100
IPv6: rename __table attribute to pure table
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 8a9b30e..68073da 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -173,11 +173,10 @@ def cleanse_ip_addr(ip_addr):
class GenericDevice:
""" A generic device class """
- __table = "override-GenericDevice"
- def __init__(self, table):
+ table = "override-GenericDevice"
+ def __init__(self):
self.id = 0
self.status = 1 # just added
- self.__table = table
self.data = {}
# default to the hardware seq...
self.sequence = "rhn_hw_dev_id_seq"
@@ -194,10 +193,10 @@ class GenericDevice:
return 1
def save(self, sysid):
""" save data in the rhnDevice table """
- log_debug(4, self.__table, self.status, self.data)
+ log_debug(4, self.table, self.status, self.data)
if not self.must_save():
return 0
- t = rhnSQL.Table(self.__table, "id")
+ t = rhnSQL.Table(self.table, "id")
# check if we have to delete
if self.status == 2 and self.id:
# delete the entry
@@ -218,7 +217,7 @@ class GenericDevice:
""" reload from rhnDevice table based on devid """
if not devid:
return -1
- t = rhnSQL.Table(self.__table, "id")
+ t = rhnSQL.Table(self.table, "id")
self.data = t[devid]
# clean up fields we don't want
if self.data:
@@ -306,7 +305,7 @@ class Device(GenericDevice):
class HardwareDevice(Device):
""" A more specific device based on the Device class """
- __table = "rhnDevice"
+ table = "rhnDevice"
def __init__(self, dict = None):
fields = ['class', 'bus', 'device', 'driver', 'detached',
'description', 'pcitype', 'prop1', 'prop2',
@@ -320,7 +319,7 @@ class HardwareDevice(Device):
class CPUDevice(Device):
""" A class for handling CPU - mirrors the rhnCPU structure """
- __table = "rhnCPU"
+ table = "rhnCPU"
def __init__(self, dict = None):
fields = ['cpu_arch_id', 'architecture', 'bogomips', 'cache',
'family', 'mhz', 'stepping', 'flags', 'model',
@@ -371,7 +370,7 @@ class CPUDevice(Device):
class NetworkInformation(Device):
""" This is a wrapper class for the Network Information (rhnServerNetwork) """
- __table = "rhnServerNetwork"
+ table = "rhnServerNetwork"
def __init__(self, dict = None):
fields = ["hostname", "ipaddr", "ip6addr"]
mapping = { 'class' : None }
@@ -558,7 +557,7 @@ class NetIfaceAddress(Device):
'address' : 'address',
}
unique = ['address'] # to be overriden by child
- __table = 'rhnServerNetAddress' # to be overriden by child
+ table = 'rhnServerNetAddress' # to be overriden by child
def __init__(self, list_ifaces=None):
log_debug(4, list_ifaces)
self.ifaces = {}
@@ -641,7 +640,7 @@ class NetIfaceAddress(Device):
columns = self.key_mapping.values() + ['interface_id']
columns.sort()
bind_params = string.join(map(lambda x: ':' + x, columns), ", ")
- h = rhnSQL.prepare(q % (self.__table, string.join(columns, ", "), bind_params))
+ h = rhnSQL.prepare(q % (self.table, string.join(columns, ", "), bind_params))
return _dml(h, params)
def _delete(self, params):
@@ -650,7 +649,7 @@ class NetIfaceAddress(Device):
columns = self.unique
wheres = map(lambda x: '%s = :%s' % (x, x), columns)
- h = rhnSQL.prepare(q % (self.__table, string.join(wheres, " and ")))
+ h = rhnSQL.prepare(q % (self.table, string.join(wheres, " and ")))
return _dml(h, params)
def _update(self, params):
@@ -668,7 +667,7 @@ class NetIfaceAddress(Device):
updates = map(lambda x: '%s = :%s' % (x, x), updates)
updates = string.join(updates, ", ")
- h = rhnSQL.prepare(q % (self.__table, updates, wheres))
+ h = rhnSQL.prepare(q % (self.table, updates, wheres))
return _dml(h, params)
def reload(self, interface_id):
@@ -676,7 +675,7 @@ class NetIfaceAddress(Device):
select *
from %s
where interface_id = :interface_id
- """ % self.__table)
+ """ % self.table)
h.execute(interface_id=interface_id)
self.db_ifaces = []
while 1:
@@ -698,7 +697,7 @@ class NetIfaceAddress6(NetIfaceAddress):
'addr' : 'address',
'scope' : 'scope',
}
- __table = 'rhnServerNetAddress6'
+ table = 'rhnServerNetAddress6'
unique = ['interface_id', 'address', 'scope']
def __init__(self, addr_dict=None):
NetIfaceAddress.__init__(self, addr_dict)
@@ -711,7 +710,7 @@ class NetIfaceAddress4(NetIfaceAddress):
'ipaddr' : 'address',
'broadcast' : 'broadcast',
}
- __table = 'rhnServerNetAddress4'
+ table = 'rhnServerNetAddress4'
unique = ['interface_id']
def __init__(self, addr_dict=None):
NetIfaceAddress.__init__(self, addr_dict)
@@ -760,7 +759,7 @@ def _transpose(hasharr):
class MemoryInformation(Device):
""" Memory information """
- __table = "rhnRAM"
+ table = "rhnRAM"
def __init__(self, dict = None):
fields = ["ram", "swap"]
mapping = { "class" : None }
@@ -781,7 +780,7 @@ class MemoryInformation(Device):
class DMIInformation(Device):
""" DMI information """
- __table = "rhnServerDMI"
+ table = "rhnServerDMI"
def __init__(self, dict = None):
fields = ["vendor", "system", "product", "asset", "board",
"bios_vendor", "bios_version", "bios_release"]
@@ -800,7 +799,7 @@ class DMIInformation(Device):
class InstallInformation(Device):
""" Install information """
- __table = "rhnServerInstallInfo"
+ table = "rhnServerInstallInfo"
def __init__(self, dict = None):
fields = ['install_method', 'iso_status', 'mediasum']
mapping = {
@@ -920,7 +919,7 @@ class Hardware:
if not self.__hardware.has_key(DevClass):
self.__hardware[DevClass] = []
- h = rhnSQL.prepare("select id from %s where server_id = :sysid" % DevClass.__table)
+ h = rhnSQL.prepare("select id from %s where server_id = :sysid" % DevClass.table)
h.execute(sysid = sysid)
rows = h.fetchall_dict() or []
12 years, 5 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 36 +++++++++-
1 file changed, 34 insertions(+), 2 deletions(-)
New commits:
commit f19f7a5eca78dd7dd905c1ad6a657e838295f101
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 22 14:52:26 2011 +0100
IPv6: disabled interface - take IPv6 addresses into account
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
index b8f929a..18641d6 100644
--- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
+++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
@@ -201,12 +201,44 @@ public class NetworkInterface extends BaseDomainHelper implements
}
/**
+ * findServerNetAddress6ByScope
+ * @param scope Address scope to search for.
+ * @return Returns IPv6 address of the given scope for the given interface.
+ */
+ private String findServerNetAddress6ByScope(String scope) {
+ Session session = HibernateFactory.getSession();
+ ServerNetAddress6 ad6 = (ServerNetAddress6)
+ session.getNamedQuery("ServerNetAddress6.lookup_by_scope_and_id")
+ .setParameter("interface_id", this.interfaceId)
+ .setParameter("scope", scope)
+ .uniqueResult();
+
+ if (ad6 == null) {
+ return null;
+ }
+ else {
+ return ad6.getAddress();
+ }
+ }
+
+ /**
+ * @return If available, returns a global IPv6 address.
+ */
+ public String getIp6Addr() {
+ return findServerNetAddress6ByScope("universe");
+ }
+
+ /**
* returns true if the NetworkInterface is disabled
* @return if it's empty or not
*/
public boolean isDisabled() {
- return this.getIpaddr() == null || this.getIpaddr().equals("0") ||
- this.getIpaddr().equals("");
+ return (this.getIpaddr() == null ||
+ this.getIpaddr().equals("0") ||
+ this.getIpaddr().equals("")) &&
+ (this.getIp6Addr() == null ||
+ this.getIp6Addr().equals("") ||
+ this.getIp6Addr().equals("0"));
}
12 years, 5 months