4 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/reports/data/inventory | 44 +++++++++++++++++++++++--
1 file changed, 41 insertions(+), 3 deletions(-)
New commits:
commit e8488469561c7bfb2e53b0d2c4557ff18ffe170e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 15:22:48 2009 +0200
reporting: add system architecture to the inventory report.
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory
index bc12d9f..5d334bb 100755
--- a/backend/satellite_tools/reports/data/inventory
+++ b/backend/satellite_tools/reports/data/inventory
@@ -17,6 +17,7 @@ columns:
system_group
organization
virtual_host
+ architecture
multival_columns:
@@ -46,7 +47,10 @@ sql:
(
select name from web_customer where rhnserver.org_id = web_customer.id
) as organization,
- virtual_data.host_system_id as virtual_host
+ virtual_data.host_system_id as virtual_host,
+ (
+ select rhnserverarch.name from rhnserverarch where rhnserver.server_arch_id = rhnserverarch.id
+ ) as architecture
from rhnserver,
(
select server_id, hostname, ipaddr
commit 847e45da3e4e0e75eb3b49ac4e27e944f6adcdf9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 15:21:52 2009 +0200
reporting: add virtual host association.
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory
index a7cf8a1..bc12d9f 100755
--- a/backend/satellite_tools/reports/data/inventory
+++ b/backend/satellite_tools/reports/data/inventory
@@ -16,6 +16,7 @@ columns:
entitlements
system_group
organization
+ virtual_host
multival_columns:
@@ -24,6 +25,7 @@ multival_columns:
configuration_channel : configuration_channel
entitlements : entitlements
system_group : system_group
+ virtual_host : virtual_host
sql:
@@ -43,7 +45,8 @@ sql:
group_data.name as system_group,
(
select name from web_customer where rhnserver.org_id = web_customer.id
- ) as organization
+ ) as organization,
+ virtual_data.host_system_id as virtual_host
from rhnserver,
(
select server_id, hostname, ipaddr
@@ -67,7 +70,12 @@ sql:
from rhnservergroupmembers, rhnservergroup
where rhnservergroupmembers.server_group_id = rhnservergroup.id (+)
and rhnservergroup.group_type is null
- ) group_data
+ ) group_data,
+ (
+ select host_system_id, virtual_system_id
+ from rhnvirtualinstance
+ where host_system_id is not null
+ ) virtual_data
where rhnserver.id = rhnservernetwork.server_id (+)
and rhnserver.id = rhnserverchannel.server_id (+)
and rhnserverchannel.channel_id = rhnchannel.id (+)
@@ -75,6 +83,8 @@ sql:
and rhnserverconfigchannel.config_channel_id = rhnconfigchannel.id (+)
and rhnserver.id = entitlement_data.server_id (+)
and rhnserver.id = group_data.server_id (+)
+ and rhnserver.id = virtual_data.virtual_system_id (+)
order by server_id, rhnchannel.parent_channel nulls first, rhnchannel.id,
- rhnconfigchannel.id, entitlement_data.server_group_id, group_data.server_group_id
+ rhnconfigchannel.id, entitlement_data.server_group_id, group_data.server_group_id,
+ virtual_data.host_system_id
commit bb75c84ff103c42da3ae97bc9866e3ac4e702821
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 15:19:40 2009 +0200
reporting: add organization membership.
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory
index 7adce63..a7cf8a1 100755
--- a/backend/satellite_tools/reports/data/inventory
+++ b/backend/satellite_tools/reports/data/inventory
@@ -15,6 +15,7 @@ columns:
configuration_channel
entitlements
system_group
+ organization
multival_columns:
@@ -39,7 +40,10 @@ sql:
rhnchannel.name as software_channel,
rhnconfigchannel.name as configuration_channel,
entitlement_data.name as entitlements,
- group_data.name as system_group
+ group_data.name as system_group,
+ (
+ select name from web_customer where rhnserver.org_id = web_customer.id
+ ) as organization
from rhnserver,
(
select server_id, hostname, ipaddr
commit 4edb190118a9b50f951a7a244efbb1a938d88059
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 15:18:33 2009 +0200
reporting: add entitlements and system groups.
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory
index 0d1a157..7adce63 100755
--- a/backend/satellite_tools/reports/data/inventory
+++ b/backend/satellite_tools/reports/data/inventory
@@ -13,12 +13,16 @@ columns:
errata_out_of_date
software_channel
configuration_channel
+ entitlements
+ system_group
multival_columns:
server_id
software_channel : software_channel
configuration_channel : configuration_channel
+ entitlements : entitlements
+ system_group : system_group
sql:
@@ -33,7 +37,9 @@ sql:
and rhnserverneededpackagecache.package_id = rhnpackage.id ) as packages_out_of_date,
( select count(*) from rhnServerErrataTypeView where rhnserver.id = server_id ) as errata_out_of_date,
rhnchannel.name as software_channel,
- rhnconfigchannel.name as configuration_channel
+ rhnconfigchannel.name as configuration_channel,
+ entitlement_data.name as entitlements,
+ group_data.name as system_group
from rhnserver,
(
select server_id, hostname, ipaddr
@@ -45,12 +51,26 @@ sql:
)
) rhnservernetwork,
rhnserverchannel, rhnchannel,
- rhnserverconfigchannel, rhnconfigchannel
+ rhnserverconfigchannel, rhnconfigchannel,
+ (
+ select rhnservergroupmembers.server_id, rhnservergroupmembers.server_group_id, rhnservergroup.name
+ from rhnservergroupmembers, rhnservergroup
+ where rhnservergroupmembers.server_group_id = rhnservergroup.id (+)
+ and rhnservergroup.group_type is not null
+ ) entitlement_data,
+ (
+ select rhnservergroupmembers.server_id, rhnservergroupmembers.server_group_id, rhnservergroup.name
+ from rhnservergroupmembers, rhnservergroup
+ where rhnservergroupmembers.server_group_id = rhnservergroup.id (+)
+ and rhnservergroup.group_type is null
+ ) group_data
where rhnserver.id = rhnservernetwork.server_id (+)
and rhnserver.id = rhnserverchannel.server_id (+)
and rhnserverchannel.channel_id = rhnchannel.id (+)
and rhnserver.id = rhnserverconfigchannel.server_id (+)
and rhnserverconfigchannel.config_channel_id = rhnconfigchannel.id (+)
+ and rhnserver.id = entitlement_data.server_id (+)
+ and rhnserver.id = group_data.server_id (+)
order by server_id, rhnchannel.parent_channel nulls first, rhnchannel.id,
- rhnconfigchannel.id
+ rhnconfigchannel.id, entitlement_data.server_group_id, group_data.server_group_id
14 years, 11 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/reports/data/inventory | 13 ++++++--
backend/satellite_tools/spacewalk-report | 38 +++++++++++++------------
2 files changed, 30 insertions(+), 21 deletions(-)
New commits:
commit 14ea93bfd94eea8906900b0cded55eacb36659c7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 15:16:09 2009 +0200
reporting: fix the logic in spacewalk-report to avoid having duplicated values.
diff --git a/backend/satellite_tools/spacewalk-report b/backend/satellite_tools/spacewalk-report
index 5d2f911..bd831a2 100755
--- a/backend/satellite_tools/spacewalk-report
+++ b/backend/satellite_tools/spacewalk-report
@@ -118,38 +118,40 @@ if __name__ == '__main__':
"Columns in report spec and in the database do not match:\nexpected %s\n got %s" % ( report.columns, db_columns ))
writer.writerow(report.columns)
- multival_keys = sorted(report.multival_columns_stop + report.multival_columns_reverted.keys())
-
row = h.fetchone()
prevrow = None
outrow = None
+ multival_dupes = {}
while row != None:
if options.multivalonrows:
writer.writerow(row)
row = h.fetchone()
continue
- if outrow == None:
- outrow = [ x for x in row ]
- else:
- go = True
- for m in multival_keys:
+ if outrow != None:
+ for m in report.multival_columns_stop:
+ if prevrow[m] != row[m]:
+ writer.writerow(outrow)
+ outrow = None
+ break
+
+ if outrow != None:
+ for m in report.multival_columns_reverted.keys():
if prevrow[m] != row[m]:
- if m in report.multival_columns_reverted:
- for v in report.multival_columns_reverted[m]:
- outrow[v] = str(outrow[v]) + options.multivalseparator + str(row[v])
- go = False
- break
- else:
- break
- if not go:
+ if not m in multival_dupes:
+ multival_dupes[m] = {}
+ if not row[m] in multival_dupes[m]:
+ outrow[m] = str(outrow[m]) + options.multivalseparator + str(row[m])
+ multival_dupes[m][row[m]] = 1
break
- if go:
- writer.writerow(outrow)
- outrow = [ x for x in row ]
+ if outrow == None:
+ outrow = [ x for x in row ]
+ multival_dupes = {}
+
prevrow = row
row = h.fetchone()
+
if outrow != None:
writer.writerow(outrow)
else:
commit 5e06b348bf5acd747dde84ed03321902fd5ce234
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 09:48:42 2009 +0200
reporting: add the configuration channel to the report.
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory
index 1423fc8..0d1a157 100755
--- a/backend/satellite_tools/reports/data/inventory
+++ b/backend/satellite_tools/reports/data/inventory
@@ -12,11 +12,13 @@ columns:
packages_out_of_date
errata_out_of_date
software_channel
+ configuration_channel
multival_columns:
server_id
software_channel : software_channel
+ configuration_channel : configuration_channel
sql:
@@ -30,7 +32,8 @@ sql:
where rhnserver.id = rhnserverneededpackagecache.server_id
and rhnserverneededpackagecache.package_id = rhnpackage.id ) as packages_out_of_date,
( select count(*) from rhnServerErrataTypeView where rhnserver.id = server_id ) as errata_out_of_date,
- rhnchannel.name as software_channel
+ rhnchannel.name as software_channel,
+ rhnconfigchannel.name as configuration_channel
from rhnserver,
(
select server_id, hostname, ipaddr
@@ -41,9 +44,13 @@ sql:
group by server_id
)
) rhnservernetwork,
- rhnserverchannel, rhnchannel
+ rhnserverchannel, rhnchannel,
+ rhnserverconfigchannel, rhnconfigchannel
where rhnserver.id = rhnservernetwork.server_id (+)
and rhnserver.id = rhnserverchannel.server_id (+)
and rhnserverchannel.channel_id = rhnchannel.id (+)
- order by server_id, rhnchannel.parent_channel nulls first, rhnchannel.id
+ and rhnserver.id = rhnserverconfigchannel.server_id (+)
+ and rhnserverconfigchannel.config_channel_id = rhnconfigchannel.id (+)
+ order by server_id, rhnchannel.parent_channel nulls first, rhnchannel.id,
+ rhnconfigchannel.id
14 years, 11 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/reports.py | 49 +++++++++++++++++++++++++
backend/satellite_tools/reports/data/inventory | 5 ++
backend/satellite_tools/spacewalk-report | 38 ++++++++++++++++++-
3 files changed, 91 insertions(+), 1 deletion(-)
New commits:
commit 2a5dbae1c9258bdb96df78152ff66b92071fff66
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 09:43:35 2009 +0200
reporting: add the --multival-separator option (semicolon is the default).
diff --git a/backend/satellite_tools/spacewalk-report b/backend/satellite_tools/spacewalk-report
index 7384f98..5d2f911 100755
--- a/backend/satellite_tools/spacewalk-report
+++ b/backend/satellite_tools/spacewalk-report
@@ -51,6 +51,10 @@ def processCommandline():
optionsTable = [
Option('--multival-on-rows', action='store_true', dest='multivalonrows',
help='if there are multiple values for certain field, repeat the rows'),
+ Option('--multival-separator', action='store', dest='multivalseparator',
+ default=';',
+ help='if there are multiple values for certain field, separate them with this string' \
+ ' (unless --multival-on-rows)'),
Option('--db', action='store', type="string",
help='alternative database string (username/password@sid);' \
+ ' default is default_db from /etc/rhn/rhn.conf'),
@@ -133,7 +137,7 @@ if __name__ == '__main__':
if prevrow[m] != row[m]:
if m in report.multival_columns_reverted:
for v in report.multival_columns_reverted[m]:
- outrow[v] = str(outrow[v]) + ';' + str(row[v])
+ outrow[v] = str(outrow[v]) + options.multivalseparator + str(row[v])
go = False
break
else:
commit c1f2d53585dbf80d9eed8ea3ee5ef276e571456e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 24 09:40:17 2009 +0200
reporting: make merging multiple values the default, and add the --multival-on-rows option to prevent it.
diff --git a/backend/satellite_tools/reports.py b/backend/satellite_tools/reports.py
index b584347..d947244 100644
--- a/backend/satellite_tools/reports.py
+++ b/backend/satellite_tools/reports.py
@@ -12,6 +12,10 @@ class report:
full_path = os.path.join(REPORT_DEFINITIONS, name)
self.sql = None
self.columns = None
+ self.column_indexes = None
+ self.multival_column_names = {}
+ self.multival_columns_reverted = {}
+ self.multival_columns_stop = []
self._load(full_path)
def _load(self, full_path):
@@ -42,9 +46,51 @@ class report:
if tag != None:
self._set(tag, value)
+ if self.multival_column_names != None:
+ unknown_columns = []
+
+ for c in self.multival_column_names:
+ if c in self.column_indexes:
+ c_id = self.column_indexes[c]
+ v = self.multival_column_names[c]
+ if v == None:
+ self.multival_columns_stop.append(c_id)
+ elif v in self.column_indexes:
+ v_id = self.column_indexes[v]
+ if v_id in self.multival_columns_reverted:
+ self.multival_columns_reverted[v_id].append(c_id)
+ else:
+ self.multival_columns_reverted[v_id] = [ c_id ]
+ else:
+ unknown_columns.append(c)
+ if len(unknown_columns) > 0:
+ raise spacewalk_report_unknown_multival_column_exception(unknown_columns)
+
+
def _set(self, tag, value):
if tag == 'columns':
self.columns = filter(lambda x: x != '', re.split('\s+', value))
+ # set mapping from column name to column position in column_indexes
+ self.column_indexes = {}
+ i = 0
+ for c in self.columns:
+ self.column_indexes[c] = i
+ i = i + 1
+ elif tag == 'multival_columns':
+ # the multival_columns specifies either
+ # a "stop" column, usually the first one,
+ # or a pair of column names separated by colon,
+ # where the first on is column which should be
+ # joined together and the second one is column
+ # whose value should be used to distinguish if
+ # we still have the same entity or not.
+ for l in filter(lambda x: x != '', re.split('\n', value)):
+ m = re.match('^\s*(\S+?)(\s*:\s*(\S*)\s*)?$', l)
+ if m == None:
+ continue
+ ( col, id_col ) = ( m.group(1), m.group(3) )
+ if col != None:
+ self.multival_column_names[col] = id_col
elif tag == 'sql':
self.sql = value
else:
@@ -57,3 +103,6 @@ class spacewalk_unknown_report(Exception):
class spacewalk_report_unknown_tag_exception(Exception):
pass
+class spacewalk_report_unknown_multival_column_exception(Exception):
+ pass
+
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory
index 1921ccb..1423fc8 100755
--- a/backend/satellite_tools/reports/data/inventory
+++ b/backend/satellite_tools/reports/data/inventory
@@ -13,6 +13,11 @@ columns:
errata_out_of_date
software_channel
+multival_columns:
+
+ server_id
+ software_channel : software_channel
+
sql:
select rhnserver.id as server_id, rhnserver.name as profile_name,
diff --git a/backend/satellite_tools/spacewalk-report b/backend/satellite_tools/spacewalk-report
index 48c1357..7384f98 100755
--- a/backend/satellite_tools/spacewalk-report
+++ b/backend/satellite_tools/spacewalk-report
@@ -49,6 +49,8 @@ except KeyboardInterrupt:
def processCommandline():
""" process the commandline """
optionsTable = [
+ Option('--multival-on-rows', action='store_true', dest='multivalonrows',
+ help='if there are multiple values for certain field, repeat the rows'),
Option('--db', action='store', type="string",
help='alternative database string (username/password@sid);' \
+ ' default is default_db from /etc/rhn/rhn.conf'),
@@ -112,10 +114,40 @@ if __name__ == '__main__':
"Columns in report spec and in the database do not match:\nexpected %s\n got %s" % ( report.columns, db_columns ))
writer.writerow(report.columns)
+ multival_keys = sorted(report.multival_columns_stop + report.multival_columns_reverted.keys())
+
row = h.fetchone()
+ prevrow = None
+ outrow = None
while row != None:
- writer.writerow(row)
+ if options.multivalonrows:
+ writer.writerow(row)
+ row = h.fetchone()
+ continue
+
+ if outrow == None:
+ outrow = [ x for x in row ]
+ else:
+ go = True
+ for m in multival_keys:
+ if prevrow[m] != row[m]:
+ if m in report.multival_columns_reverted:
+ for v in report.multival_columns_reverted[m]:
+ outrow[v] = str(outrow[v]) + ';' + str(row[v])
+ go = False
+ break
+ else:
+ break
+ if not go:
+ break
+
+ if go:
+ writer.writerow(outrow)
+ outrow = [ x for x in row ]
+ prevrow = row
row = h.fetchone()
+ if outrow != None:
+ writer.writerow(outrow)
else:
for r in reports.available_reports():
print r
14 years, 11 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 39 ++++------
1 file changed, 17 insertions(+), 22 deletions(-)
New commits:
commit e8f6177222045bc30a6e0818cdd3aa36bea2d659
Author: Partha Aji <paji(a)redhat.com>
Date: Fri Jul 24 00:05:45 2009 -0400
515539 - Made the cobbler create system record command always delete and create a new version of system
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 00b7abe..09ad45d 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -150,14 +150,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
sysname = (String) sysmap.get("name");
}
}
- if (sysname != null) {
- String handle = (String) invokeXMLRPC("get_system_handle",
- sysname, xmlRpcToken);
- log.debug("getSystemHandleByMAC.returning handle: " + handle);
- return handle;
- }
-
- return null;
+ return sysname;
}
private Map getSystemMapByMac() {
@@ -209,27 +202,30 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
* @return ValidatorError if the store failed.
*/
public ValidatorError store() {
- String handle = null;
// First lookup by MAC addr
- handle = lookupExisting();
- if (handle == null) {
+ String sysName = lookupExisting();
+ if (sysName == null) {
// Next try by name
try {
- handle = (String) invokeXMLRPC("get_system_handle",
+ String handle = (String) invokeXMLRPC("get_system_handle",
getCobblerSystemRecordName(), xmlRpcToken);
+ if (!StringUtils.isBlank(handle)) {
+ sysName = getCobblerSystemRecordName();
+ }
log.debug("Did we find handle by name: " + handle);
}
catch (RuntimeException e) {
log.debug("No system by that name either. create a new one");
}
}
- // Else, lets make a new system
- if (handle == null) {
- handle = (String) invokeXMLRPC("new_system", xmlRpcToken);
- log.debug("handle: " + handle);
- invokeXMLRPC("modify_system", handle, "name", getCobblerSystemRecordName(),
- xmlRpcToken);
+ if (!StringUtils.isBlank(sysName)) {
+ invokeXMLRPC("remove_system", sysName, xmlRpcToken);
+ invokeCobblerUpdate();
}
+ String handle = (String) invokeXMLRPC("new_system", xmlRpcToken);
+ log.debug("handle: " + handle);
+ invokeXMLRPC("modify_system", handle, "name", getCobblerSystemRecordName(),
+ xmlRpcToken);
if (this.server.getNetworkInterfaces() != null &&
!this.server.getNetworkInterfaces().isEmpty()) {
@@ -321,10 +317,9 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
if (!StringUtils.isBlank(n.getNetmask())) {
inet.put("subnet-" + n.getName(), n.getNetmask());
}
- if (!StringUtils.isBlank(staticNetwork) &&
- n.getName().equals(staticNetwork)) {
- inet.put("static-" + n.getName(), Boolean.TRUE);
- }
+ inet.put("static-" + n.getName(),
+ !StringUtils.isBlank(staticNetwork) &&
+ n.getName().equals(staticNetwork));
}
}
log.debug("Networks: " + inet);
14 years, 11 months
Branch 'VADER' - web/html
by Partha Aji
web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit b6696760980e402276eb9295bf75f93e17f6a9ec
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 23 19:20:58 2009 -0400
512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files
diff --git a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf
index 7699ae6..9729ab7 100644
--- a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf
@@ -52,3 +52,6 @@
RewriteRule ^/rhn/?$ https://%{SERVER_NAME}/rhn/ [R,L]
</IfModule>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
14 years, 11 months
web/html
by Partha Aji
web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 0082f6412e4a55b8de665278056645e99764f3d0
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 23 19:20:58 2009 -0400
512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files
diff --git a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf
index 7699ae6..9729ab7 100644
--- a/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/5.0/httpd/rhn_proxy.conf
@@ -52,3 +52,6 @@
RewriteRule ^/rhn/?$ https://%{SERVER_NAME}/rhn/ [R,L]
</IfModule>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
14 years, 11 months
Branch 'VADER' - java/code
by Partha Aji
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 3 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 3 ++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 6 ++++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java | 14 ++++++++--
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 12 +++-----
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 12 ++++++++
java/code/src/org/cobbler/SystemRecord.java | 9 +++++-
7 files changed, 48 insertions(+), 11 deletions(-)
New commits:
commit a52696edf5cfb79624328bb92ff2af3349f98016
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 23 18:52:03 2009 -0400
510299 & 510785- Fixed issues pertaining to static network and upgrade.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index ae19e78..c7a5108 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -871,7 +871,7 @@ public class KickstartFactory extends HibernateFactory {
* @param tree to lookup by
* @return List of KickstartData objects if found
*/
- public static List lookupKickstartDatasByTree(KickstartableTree tree) {
+ public static List<KickstartData> lookupKickstartDatasByTree(KickstartableTree tree) {
String query = "KickstartData.lookupByTreeId";
Session session = HibernateFactory.getSession();
return session.getNamedQuery(query)
@@ -1023,4 +1023,5 @@ public class KickstartFactory extends HibernateFactory {
Session session = HibernateFactory.getSession();
return (List<KickstartableTree>) session.getNamedQuery(query).list();
}
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index cb90be6..bdddc4c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -4062,6 +4062,9 @@ public class SystemHandler extends BaseHandler {
String hostName = (String)data.get("hostname");
String command = KickstartFormatter.makeStaticNetworkCommand(device, ip, gateway,
nameservers.get(0), netmask, hostName);
+ rec.setHostName(hostName);
+ rec.setGateway(gateway);
+ rec.setNameServers(nameservers);
Map<String, Object> meta = rec.getKsMeta();
meta.put(KickstartFormatter.STATIC_NETWORK_VAR, command);
rec.setKsMeta(meta);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index ff57259..942fdbd 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -576,6 +576,9 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
cmd.setKernelOptions(getExtraOptions());
cmd.setPostKernelOptions(postKernelOptions);
cmd.setScheduledAction(kickstartAction);
+ if (!isDhcp) {
+ cmd.setStaticNetwork(networkInterface);
+ }
ValidatorError cobblerError = cmd.store();
if (cobblerError != null) {
return cobblerError;
@@ -589,6 +592,9 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
cmd.setKernelOptions(kernelOptions);
cmd.setPostKernelOptions(postKernelOptions);
cmd.setScheduledAction(kickstartAction);
+ if (!isDhcp) {
+ cmd.setStaticNetwork(networkInterface);
+ }
ValidatorError cobblerError = cmd.store();
if (cobblerError != null) {
return cobblerError;
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
index e24207c..e8e07d4 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
@@ -15,6 +15,8 @@
package com.redhat.rhn.manager.kickstart.cobbler;
import com.redhat.rhn.common.validator.ValidatorError;
+import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartUrlHelper;
@@ -23,6 +25,7 @@ import org.apache.log4j.Logger;
import org.cobbler.Distro;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -95,10 +98,17 @@ public class CobblerDistroCreateCommand extends CobblerDistroCommand {
}
if (syncProfiles) {
- CobblerProfileSyncCommand syncer = new CobblerProfileSyncCommand();
- syncer.store();
+ List<KickstartData> profiles = KickstartFactory.
+ lookupKickstartDatasByTree(tree);
+ for (KickstartData profile : profiles) {
+ createProfile(profile);
+ }
}
return null;
}
+ private void createProfile(KickstartData profile) {
+ CobblerProfileCreateCommand creator = new CobblerProfileCreateCommand(profile);
+ creator.store();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
index 83edac3..ef9d073 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
@@ -70,19 +70,16 @@ public class CobblerProfileSyncCommand extends CobblerCommand {
public ValidatorError store() {
//First are there any profiles within spacewalk that aren't within cobbler
List<KickstartData> profiles = KickstartFactory.listAllKickstartData();
-
-
Map<String, Map> profileNames = getModifiedProfileNames();
for (KickstartData profile : profiles) {
if (!profileNames.containsKey(profile.getCobblerId())) {
createProfile(profile);
- profile.setModified(new Date());
}
}
-
-
- log.debug(profiles);
- log.debug(profileNames);
+ if (log.isDebugEnabled()) {
+ log.debug(profiles);
+ log.debug(profileNames);
+ }
//Are there any profiles on cobbler that have changed
for (KickstartData profile : profiles) {
if (profileNames.containsKey(profile.getCobblerId())) {
@@ -103,6 +100,7 @@ public class CobblerProfileSyncCommand extends CobblerCommand {
private void createProfile(KickstartData profile) {
CobblerProfileCreateCommand creator = new CobblerProfileCreateCommand(profile);
creator.store();
+ profile.setModified(new Date());
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 853dd7b..00b7abe 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -55,6 +55,14 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
private String kickstartHost;
private String kernelOptions;
private String postKernelOptions;
+ private String staticNetwork;
+
+ /**
+ * @param staticNetworkIn The staticNetwork to set.
+ */
+ public void setStaticNetwork(String staticNetworkIn) {
+ staticNetwork = staticNetworkIn;
+ }
/**
* Constructor
@@ -313,6 +321,10 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
if (!StringUtils.isBlank(n.getNetmask())) {
inet.put("subnet-" + n.getName(), n.getNetmask());
}
+ if (!StringUtils.isBlank(staticNetwork) &&
+ n.getName().equals(staticNetwork)) {
+ inet.put("static-" + n.getName(), Boolean.TRUE);
+ }
}
}
log.debug("Networks: " + inet);
diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/org/cobbler/SystemRecord.java
index 32bcd50..234ad40 100644
--- a/java/code/src/org/cobbler/SystemRecord.java
+++ b/java/code/src/org/cobbler/SystemRecord.java
@@ -27,6 +27,7 @@ import java.util.Set;
*/
public class SystemRecord extends CobblerObject {
+ private static final String HOSTNAME = "hostname";
private static final String NAME_SERVERS = "name_servers";
private static final String GATEWAY = "gateway";
private static final String PROFILE = "profile";
@@ -306,7 +307,7 @@ public class SystemRecord extends CobblerObject {
/**
* @param nameServersIn the NameServers
*/
- public void setNameServers(String nameServersIn) {
+ public void setNameServers(List<String> nameServersIn) {
modify(NAME_SERVERS, nameServersIn);
}
@@ -316,4 +317,10 @@ public class SystemRecord extends CobblerObject {
public void setGateway(String gateway) {
modify(GATEWAY, gateway);
}
+ /**
+ * @param hostname the hostname
+ */
+ public void setHostName(String hostname) {
+ modify(HOSTNAME, hostname);
+ }
}
14 years, 11 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 3 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 3 ++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 6 ++++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java | 14 ++++++++--
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 4 --
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 12 ++++++++
java/code/src/org/cobbler/SystemRecord.java | 9 +++++-
7 files changed, 44 insertions(+), 7 deletions(-)
New commits:
commit d5df7da09e32ff9d5e5a814a17d5d50ff7471bb5
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 23 18:52:03 2009 -0400
510299 & 510785- Fixed issues pertaining to static network and upgrade.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index ae19e78..c7a5108 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -871,7 +871,7 @@ public class KickstartFactory extends HibernateFactory {
* @param tree to lookup by
* @return List of KickstartData objects if found
*/
- public static List lookupKickstartDatasByTree(KickstartableTree tree) {
+ public static List<KickstartData> lookupKickstartDatasByTree(KickstartableTree tree) {
String query = "KickstartData.lookupByTreeId";
Session session = HibernateFactory.getSession();
return session.getNamedQuery(query)
@@ -1023,4 +1023,5 @@ public class KickstartFactory extends HibernateFactory {
Session session = HibernateFactory.getSession();
return (List<KickstartableTree>) session.getNamedQuery(query).list();
}
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index cb90be6..bdddc4c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -4062,6 +4062,9 @@ public class SystemHandler extends BaseHandler {
String hostName = (String)data.get("hostname");
String command = KickstartFormatter.makeStaticNetworkCommand(device, ip, gateway,
nameservers.get(0), netmask, hostName);
+ rec.setHostName(hostName);
+ rec.setGateway(gateway);
+ rec.setNameServers(nameservers);
Map<String, Object> meta = rec.getKsMeta();
meta.put(KickstartFormatter.STATIC_NETWORK_VAR, command);
rec.setKsMeta(meta);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index ff57259..942fdbd 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -576,6 +576,9 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
cmd.setKernelOptions(getExtraOptions());
cmd.setPostKernelOptions(postKernelOptions);
cmd.setScheduledAction(kickstartAction);
+ if (!isDhcp) {
+ cmd.setStaticNetwork(networkInterface);
+ }
ValidatorError cobblerError = cmd.store();
if (cobblerError != null) {
return cobblerError;
@@ -589,6 +592,9 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
cmd.setKernelOptions(kernelOptions);
cmd.setPostKernelOptions(postKernelOptions);
cmd.setScheduledAction(kickstartAction);
+ if (!isDhcp) {
+ cmd.setStaticNetwork(networkInterface);
+ }
ValidatorError cobblerError = cmd.store();
if (cobblerError != null) {
return cobblerError;
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
index e24207c..e8e07d4 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java
@@ -15,6 +15,8 @@
package com.redhat.rhn.manager.kickstart.cobbler;
import com.redhat.rhn.common.validator.ValidatorError;
+import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartUrlHelper;
@@ -23,6 +25,7 @@ import org.apache.log4j.Logger;
import org.cobbler.Distro;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -95,10 +98,17 @@ public class CobblerDistroCreateCommand extends CobblerDistroCommand {
}
if (syncProfiles) {
- CobblerProfileSyncCommand syncer = new CobblerProfileSyncCommand();
- syncer.store();
+ List<KickstartData> profiles = KickstartFactory.
+ lookupKickstartDatasByTree(tree);
+ for (KickstartData profile : profiles) {
+ createProfile(profile);
+ }
}
return null;
}
+ private void createProfile(KickstartData profile) {
+ CobblerProfileCreateCommand creator = new CobblerProfileCreateCommand(profile);
+ creator.store();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
index a9f8b53..7c83dc8 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
@@ -70,12 +70,10 @@ public class CobblerProfileSyncCommand extends CobblerCommand {
public ValidatorError store() {
//First are there any profiles within spacewalk that aren't within cobbler
List<KickstartData> profiles = KickstartFactory.listAllKickstartData();
-
-
Map<String, Map> profileNames = getModifiedProfileNames();
for (KickstartData profile : profiles) {
if (!profileNames.containsKey(profile.getCobblerId())) {
- if (profile.getKickstartDefaults().getKstree().getCobblerId() != null) {
+ if (profile.getKickstartDefaults().getKstree().getCobblerId() == null) {
log.warn("Kickstart profile " + profile.getLabel() +
" could not be synced to cobbler, due to it's " +
"tree being unsynced. Please edit the tree url " +
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 853dd7b..00b7abe 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -55,6 +55,14 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
private String kickstartHost;
private String kernelOptions;
private String postKernelOptions;
+ private String staticNetwork;
+
+ /**
+ * @param staticNetworkIn The staticNetwork to set.
+ */
+ public void setStaticNetwork(String staticNetworkIn) {
+ staticNetwork = staticNetworkIn;
+ }
/**
* Constructor
@@ -313,6 +321,10 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
if (!StringUtils.isBlank(n.getNetmask())) {
inet.put("subnet-" + n.getName(), n.getNetmask());
}
+ if (!StringUtils.isBlank(staticNetwork) &&
+ n.getName().equals(staticNetwork)) {
+ inet.put("static-" + n.getName(), Boolean.TRUE);
+ }
}
}
log.debug("Networks: " + inet);
diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/org/cobbler/SystemRecord.java
index 32bcd50..234ad40 100644
--- a/java/code/src/org/cobbler/SystemRecord.java
+++ b/java/code/src/org/cobbler/SystemRecord.java
@@ -27,6 +27,7 @@ import java.util.Set;
*/
public class SystemRecord extends CobblerObject {
+ private static final String HOSTNAME = "hostname";
private static final String NAME_SERVERS = "name_servers";
private static final String GATEWAY = "gateway";
private static final String PROFILE = "profile";
@@ -306,7 +307,7 @@ public class SystemRecord extends CobblerObject {
/**
* @param nameServersIn the NameServers
*/
- public void setNameServers(String nameServersIn) {
+ public void setNameServers(List<String> nameServersIn) {
modify(NAME_SERVERS, nameServersIn);
}
@@ -316,4 +317,10 @@ public class SystemRecord extends CobblerObject {
public void setGateway(String gateway) {
modify(GATEWAY, gateway);
}
+ /**
+ * @param hostname the hostname
+ */
+ public void setHostName(String hostname) {
+ modify(HOSTNAME, hostname);
+ }
}
14 years, 11 months
Branch 'VADER' - web/html
by Partha Aji
web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf | 3 +++
web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf | 3 +++
web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf | 4 ++++
web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf | 2 +-
web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf | 2 +-
5 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit a60371a0ccee8ab582eeb01c6fbbabf5e58b18a8
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 23 16:45:51 2009 -0400
512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files
diff --git a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf
index fba9c9e..4832797 100644
--- a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf
@@ -44,3 +44,6 @@
DefaultType text/plain
</LocationMatch>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
diff --git a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf
index fba9c9e..4832797 100644
--- a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf
@@ -44,3 +44,6 @@
DefaultType text/plain
</LocationMatch>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
diff --git a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf
index fba9c9e..741e2e5 100644
--- a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf
@@ -44,3 +44,7 @@
DefaultType text/plain
</LocationMatch>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
+
diff --git a/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf
index 20fbbc1..93bf30b 100644
--- a/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf
@@ -69,5 +69,5 @@ RewriteRule .* - [F]
#Disable SSL2, left only higher
SSLProtocol all -SSLv2
-
+SSLProxyEngine on
diff --git a/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf
index 56ecec7..fe5e6eb 100644
--- a/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf
@@ -79,5 +79,5 @@
#Disable SSL2, left only higher
SSLProtocol all -SSLv2
-
+SSLProxyEngine on
14 years, 11 months
web/html
by Partha Aji
web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf | 3 +++
web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf | 3 +++
web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf | 4 ++++
web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf | 2 +-
web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf | 2 +-
5 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit cd92c65cf39ec26dabf3889ad4a6d17c713e1abb
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 23 16:45:51 2009 -0400
512440 - Fixed the proxies to turn SSLProxyEngine to deal with Cobbler KS files
diff --git a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf
index fba9c9e..4832797 100644
--- a/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/4.0/httpd/rhn_proxy.conf
@@ -44,3 +44,6 @@
DefaultType text/plain
</LocationMatch>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
diff --git a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf
index fba9c9e..4832797 100644
--- a/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/4.1/httpd/rhn_proxy.conf
@@ -44,3 +44,6 @@
DefaultType text/plain
</LocationMatch>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
diff --git a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf
index fba9c9e..741e2e5 100644
--- a/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/4.2/httpd/rhn_proxy.conf
@@ -44,3 +44,7 @@
DefaultType text/plain
</LocationMatch>
+#Disable SSL2, left only higher
+SSLProtocol all -SSLv2
+SSLProxyEngine on
+
diff --git a/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf
index 20fbbc1..93bf30b 100644
--- a/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/5.1/httpd/rhn_proxy.conf
@@ -69,5 +69,5 @@ RewriteRule .* - [F]
#Disable SSL2, left only higher
SSLProtocol all -SSLv2
-
+SSLProxyEngine on
diff --git a/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf b/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf
index 56ecec7..fe5e6eb 100644
--- a/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf
+++ b/web/html/applications/rhn-proxy/5.2/httpd/rhn_proxy.conf
@@ -79,5 +79,5 @@
#Disable SSL2, left only higher
SSLProtocol all -SSLv2
-
+SSLProxyEngine on
14 years, 11 months