spacewalk-commits September 2009

spacewalk-commits@lists.fedorahosted.org

8 participants
121 discussions

java/scripts
by Justin Sherrill 16 Sep '09

16 Sep '09

java/scripts/gen-eclipse.py | 1 - 1 file changed, 1 deletion(-) New commits: commit ca29dcfd0a2defcb45442bcb2b7de04aded94bd9 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Sep 16 12:49:41 2009 -0400 fixing broken path in eclipse classpath generation diff --git a/java/scripts/gen-eclipse.py b/java/scripts/gen-eclipse.py index 2762f0a..b84953a 100755 --- a/java/scripts/gen-eclipse.py +++ b/java/scripts/gen-eclipse.py @@ -4,7 +4,6 @@ from sys import argv, exit base_template="""<?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="code/internal/src"/> - <classpathentry kind="src" path="build/src"/> <classpathentry excluding="**/.svn|**/.svn/**" kind="src" path="code/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build/classes"/>

1 0

backend/satellite_tools
by Jan Pazdziora 16 Sep '09

16 Sep '09

backend/satellite_tools/updatePackages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c95a6b21b9d41d3dbfa80a52e956142120763026 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Sep 16 17:22:02 2009 +0200 523760 - assign the md5sum variable properly, before we use it. diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index bea36c4..35073e5 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -153,6 +153,7 @@ def process_package_data(): continue old_abs_path = os.path.join(CFG.MOUNT_POINT, path['path']) + md5sum = path['md5sum'] new_path = get_new_pkg_path(nvrea, org_id, old_path_nvrea[0], \ md5sum=md5sum) new_abs_path = os.path.join(CFG.MOUNT_POINT, new_path) @@ -166,7 +167,6 @@ def process_package_data(): skip_list.append(old_abs_path) if debug: Log.writeMessage("Missing Path: %s" % old_abs_path) continue - md5sum = path['md5sum'] try: #hdr = get_package_info(old_abs_path)

1 0

backend/satellite_tools
by Jan Pazdziora 16 Sep '09

16 Sep '09

backend/satellite_tools/updatePackages.py | 43 ++++++++++++++++++------------ 1 file changed, 27 insertions(+), 16 deletions(-) New commits: commit 82afbb68ef1af1f87ba2a9e9466f14e67fbb053b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Sep 16 17:17:51 2009 +0200 523760 - check if the file is already in the correct location, proceed accordingly. diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index 7769a2e..bea36c4 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -134,6 +134,7 @@ def process_package_data(): finalSize=len(paths), finalBarLength=40, stream=sys.stdout) pb.printAll(1) skip_list = [] + new_ok_list = [] i = 0 for path in paths: pb.addTo(1) @@ -152,10 +153,19 @@ def process_package_data(): continue old_abs_path = os.path.join(CFG.MOUNT_POINT, path['path']) + new_path = get_new_pkg_path(nvrea, org_id, old_path_nvrea[0], \ + md5sum=md5sum) + new_abs_path = os.path.join(CFG.MOUNT_POINT, new_path) + if not os.path.exists(old_abs_path): - skip_list.append(old_abs_path) - if debug: Log.writeMessage("Missing Path: %s" % old_abs_path) - continue + if os.path.exists(new_abs_path): + new_ok_list.append(new_abs_path) + if debug: Log.writeMessage("File %s already on final path %s" % (path['path'], new_abs_path)) + old_abs_path = new_abs_path + else: + skip_list.append(old_abs_path) + if debug: Log.writeMessage("Missing Path: %s" % old_abs_path) + continue md5sum = path['md5sum'] try: @@ -163,20 +173,20 @@ def process_package_data(): hdr = rhn_rpm.get_package_header(filename=old_abs_path) except IOError: raise - new_path = get_new_pkg_path(nvrea, org_id, old_path_nvrea[0], \ - md5sum=md5sum) - new_abs_path = os.path.join(CFG.MOUNT_POINT, new_path) - new_abs_dir = os.path.dirname(new_abs_path) - # relocate the package on the filer - if not os.path.isdir(new_abs_dir): - os.makedirs(new_abs_dir) - shutil.move(old_abs_path, new_abs_path) - # Clean up left overs - os.removedirs(os.path.dirname(old_abs_path)) - # make the path readable - os.chmod(new_abs_path, 0644) - if debug: Log.writeMessage("Relocated %s to %s on filer" \ + + if old_abs_path != new_abs_path: + new_abs_dir = os.path.dirname(new_abs_path) + # relocate the package on the filer + if not os.path.isdir(new_abs_dir): + os.makedirs(new_abs_dir) + shutil.move(old_abs_path, new_abs_path) + # Clean up left overs + os.removedirs(os.path.dirname(old_abs_path)) + # make the path readable + os.chmod(new_abs_path, 0644) + if debug: Log.writeMessage("Relocated %s to %s on filer" \ % (old_abs_path, new_abs_path)) + # Update the db paths _update_package_path.execute(the_id= path['id'], \ new_path = new_path ) @@ -194,6 +204,7 @@ def process_package_data(): rhnSQL.commit() sys.stderr.write("Transaction Committed! \n") if verbose: print " Skipping %s packages, paths not found" % len(skip_list) + if len(new_ok_list) > 0 and verbose: print " There were %s packages found in the correct location" % len(new_ok_list) return def process_kickstart_trees():

1 0

2 commits - backend/satellite_tools
by Jan Pazdziora 16 Sep '09

16 Sep '09

backend/satellite_tools/updatePackages.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 714f2d07cbbd8e19ddde53f4e5a80c33b5f137ff Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Sep 16 16:44:35 2009 +0200 No need to sleep if we want the /var/satellite migration to be faster. diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index 903e15b..7769a2e 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -137,7 +137,6 @@ def process_package_data(): i = 0 for path in paths: pb.addTo(1) - time.sleep(0.005) pb.printIncrement() old_path_nvrea = path['path'].split('/') org_id = old_path_nvrea[1] commit d4d824d468b2b682f7bc02b9f432fa5c75f5e5d6 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Sep 16 16:40:42 2009 +0200 Update using id, as there is no index on rhnPackage.path which could be used. diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index 7b6a575..903e15b 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -102,7 +102,7 @@ def get_new_pkg_path(nvrea, org_id, prepend="", omit_epoch=None, _get_path_query = """ - select rhnPackage.md5sum, rhnPackage.path, rhnPackageEvr.epoch + select rhnPackage.id, rhnPackage.md5sum, rhnPackage.path, rhnPackageEvr.epoch from rhnPackage, rhnPackageEvr where rhnPackage.path not like '%'||rhnPackage.MD5SUM||'%' and rhnPackage.evr_id = rhnPackageEvr.id @@ -111,7 +111,7 @@ _get_path_query = """ _update_pkg_path_query = """ update rhnPackage set path =: new_path - where path =: old_path + where id = :the_id """ def process_package_data(): @@ -179,7 +179,7 @@ def process_package_data(): if debug: Log.writeMessage("Relocated %s to %s on filer" \ % (old_abs_path, new_abs_path)) # Update the db paths - _update_package_path.execute(old_path= path['path'], \ + _update_package_path.execute(the_id= path['id'], \ new_path = new_path ) if debug: Log.writeMessage("query Executed: %s" \ % _update_pkg_path_query )

1 0

backend/satellite_tools
by Jan Pazdziora 16 Sep '09

16 Sep '09

backend/satellite_tools/updatePackages.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit d00dc3a5efd28f683fd680cabffb7ae969895900 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Sep 16 16:23:38 2009 +0200 523384 - break up the transaction into smaller chunks. diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index 6ba5492..7b6a575 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -74,9 +74,7 @@ def main(): process_package_data() - rhnSQL.commit() process_kickstart_trees() - sys.stderr.write("Transaction Committed! \n") def get_new_pkg_path(nvrea, org_id, prepend="", omit_epoch=None, package_type='rpm', md5sum=None): @@ -136,6 +134,7 @@ def process_package_data(): finalSize=len(paths), finalBarLength=40, stream=sys.stdout) pb.printAll(1) skip_list = [] + i = 0 for path in paths: pb.addTo(1) time.sleep(0.005) @@ -187,8 +186,14 @@ def process_package_data(): # Process gpg key ids server_packages.processPackageKeyAssociations(hdr, md5sum) if debug: Log.writeMessage("gpg key info updated" ) + i = i + 1 + # we need to break the transaction to smaller pieces + if i % 1000 == 0: + rhnSQL.commit() pb.printComplete() - # All done, proceed to commit + # All done, final commit + rhnSQL.commit() + sys.stderr.write("Transaction Committed! \n") if verbose: print " Skipping %s packages, paths not found" % len(skip_list) return

1 0

backend/satellite_tools
by Jan Pazdziora 16 Sep '09

16 Sep '09

backend/satellite_tools/updatePackages.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit f67b418c62184fc755670e98b0b7657e828d41a0 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Sep 16 16:19:14 2009 +0200 523393 - we are not able to parse the epoch out from filename, need to fetch it from database. diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index daa5d37..6ba5492 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -104,9 +104,10 @@ def get_new_pkg_path(nvrea, org_id, prepend="", omit_epoch=None, _get_path_query = """ - select md5sum, path - from rhnPackage - where path not like '%'||MD5SUM||'%' + select rhnPackage.md5sum, rhnPackage.path, rhnPackageEvr.epoch + from rhnPackage, rhnPackageEvr + where rhnPackage.path not like '%'||rhnPackage.MD5SUM||'%' + and rhnPackage.evr_id = rhnPackageEvr.id """ _update_pkg_path_query = """ @@ -143,6 +144,8 @@ def process_package_data(): org_id = old_path_nvrea[1] try: nvrea = parseRPMFilename(old_path_nvrea[-1]) + if nvrea[3] in [ None, '']: + nvrea[3] = path['epoch'] except: # probably not qan rpm skip if debug:

1 0

schema/spacewalk
by Michael Mraka 16 Sep '09

16 Sep '09

schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-2-rhnPackageChangeLog-id-data.sql | 15 +++++++--- 1 file changed, 11 insertions(+), 4 deletions(-) New commits: commit 9c5eb487dfe81a8900be7eda42f82dc8bf82ef09 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 16 15:56:03 2009 +0200 523389 - split update into smaller chunks so it will not eat all UNDO at once diff --git a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-2-rhnPackageChangeLog-id-data.sql b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-2-rhnPackageChangeLog-id-data.sql index d3e50c8..ce15ede 100644 --- a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-2-rhnPackageChangeLog-id-data.sql +++ b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-2-rhnPackageChangeLog-id-data.sql @@ -1,5 +1,12 @@ - -update rhnPackageChangelog -set id = rhn_pkg_cl_id_seq.nextval -where id is null; +begin + loop + update rhnPackageChangelog + set id = rhn_pkg_cl_id_seq.nextval + where id is null and rownum <= 1000000; + exit when sql%rowcount = 0; + commit; + end loop; + commit; +end; +/

1 0

3 commits - java/code monitoring/nocpulse-common monitoring/SatConfig schema/spacewalk spacewalk/setup web/modules
by Miroslav Suchý 11 Sep '09

11 Sep '09

java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml | 18 - java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java | 59 ----- java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java | 17 - java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java | 19 - java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java | 2 java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java | 13 - monitoring/SatConfig/general/NOCpulse-ini | 8 monitoring/nocpulse-common/NOCpulse.ini.txt | 9 monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm | 7 schema/spacewalk/common/data/data.deps | 2 schema/spacewalk/common/data/rhn_config_macro.sql | 112 +++++----- schema/spacewalk/common/data/rhn_db_environment.sql | 44 --- schema/spacewalk/common/data/rhn_environment.sql | 44 --- schema/spacewalk/common/tables/rhn_config_macro.sql | 10 schema/spacewalk/common/tables/rhn_db_environment.sql | 32 -- schema/spacewalk/common/tables/rhn_environment.sql | 28 -- schema/spacewalk/common/tables/tables.deps | 2 schema/spacewalk/oracle/synonyms/db_environment.sql | 28 -- schema/spacewalk/oracle/synonyms/environment.sql | 28 -- schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql | 11 spacewalk/setup/bin/spacewalk-setup | 33 -- spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 3 web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml | 6 web/modules/rhn/RHN/DB/SatInstall.pm | 21 - 24 files changed, 76 insertions(+), 480 deletions(-) New commits: commit 0535a5c5c38ab6a3a6bbcc8790f1775ec0d9f32a Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Sep 11 15:33:23 2009 +0200 476851 - removal of tables: rhn_db_environment, rhn_environment (upgrade) diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql new file mode 100644 index 0000000..2e08148 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql @@ -0,0 +1,11 @@ +alter table rhn_config_macro drop constraint rhn_confm_envir_environment_fk; +alter table rhn_config_macro drop primary key; +drop index rhn_confm_environment_name_pk; + +create unique index rhn_confm_name_pk + on rhn_config_macro (name) + tablespace [[2m_tbs]]; +alter table rhn_config_macro add constraint rhn_confm_name_pk primary key (name); + +drop table rhn_environment; +drop table rhn_db_environment; commit cdc3143c33c4e01efc130ab19afe1ce50a6d1ab4 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Sep 11 15:26:47 2009 +0200 476851 - remove environment colum which refers to deleted rhn_enviroment table diff --git a/schema/spacewalk/common/data/rhn_config_macro.sql b/schema/spacewalk/common/data/rhn_config_macro.sql index 8c6eb90..184868d 100644 --- a/schema/spacewalk/common/data/rhn_config_macro.sql +++ b/schema/spacewalk/common/data/rhn_config_macro.sql @@ -20,62 +20,62 @@ --data for rhn_config_macro -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CCS_CRYPTKEY', '**CCS_CRYPTKEY**', 'ClusterConfigSvcs encryption key', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CFDBHOST', '%{RHN_SAT_HOSTNAME}', 'Configuration database host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CFDB_NAME', '%{RHN_DB_NAME}', 'Configuration database name', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CFDB_NOTIF_PASSWD', '%{RHN_DB_PASSWD}', 'Configuration database notification user password', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CFDB_PASSWD', '%{RHN_DB_PASSWD}', 'Configuration database password', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CSDBHOST', '%{CFDBHOST}', 'Current state database host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CSDB_NAME', '%{RHN_DB_NAME}', 'Current state database name', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'CSDB_PASSWD', '%{CFDB_PASSWD}', 'Current state database password', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'DOM', '**DOM**', 'Local host domain (e.g. ''redhat.com'')', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'EDOM', '%{DOM}', 'Environment-specific domain (e.g. ''dev.rhn_net'')', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'ENV', 'license', 'Environment (e.g. ''prod'')', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'GRITCH_TARGETCUST', '**GRITCH_TARGETCUST**', 'Administrative destination customer ID', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'GRITCH_TARGETDEST', '%{GRITCH_TARGETCUST}_%{GRITCH_TARGETDESTID}_%{GRITCH_TARGETDESTNAME}', 'Gritch target destination', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'GRITCH_TARGETDESTID', '**GRITCH_TARGETDESTID**', 'Administrative destination recid', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'GRITCH_TARGETDESTNAME', '**GRITCH_TARGETDESTNAME**', 'Administrative destination name', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'INNOVATE_LOGINDIR', 'NULL', 'Innovate login directory', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'INNOVATE_PASSWD', 'NULL', 'Innovate password', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'IPROTO', 'http', 'Internal protocol (e.g. ''http'')', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'MAIL_MX', '**MAIL_MX**', 'Local mail exchanger', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'MDOM', '**MDOM**', 'Mail domain (e.g. ''redhat.com'' for myemail(a)redhat.com)', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'NOTIFDOWNEMAIL', '%{RHN_ADMIN_EMAIL}', 'Email to notif in case of notif meltdown', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'NOTIFHOST', '%{RHN_SAT_HOSTNAME}', 'Notification host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'NOTIFURL', '%{IPROTO}://%{NOTIFHOST}/cgi-mod-perl/enqueue.cgi', 'Notification server URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'NOTIF_ADMINPORT', '%{RHN_SAT_WEB_PORT}', 'Notification administrative webserver port', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'NOTIF_ADMIN_EMAIL', '%{RHN_ADMIN_EMAIL}', 'Notification administrator email', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'NPBIN', '/usr/bin', 'Production user bin directory', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'NPETC', '/etc/nocpulse', 'Production user etc directory', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'NPHOME', '/var/lib/%{USER}', 'Production user home directory', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'NPVAR', '/var/log/%{USER}', 'Production user var directory', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'NPLIB', '/var/lib/%{USER}', 'Production user data directory', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'PORTALURL', '%{XPROTO}://%{RHN_SAT_HOSTNAME}', 'Portal URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_ADMIN_EMAIL', '**RHN_ADMIN_EMAIL**', 'Spacewalk administrator email', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_DB_NAME', '**RHN_DB_NAME**', 'Spacewalk database name ', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_DB_PASSWD', '**RHN_DB_PASSWD**', 'Spacewalk database password', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_DB_TABLE_OWNER', '**RHN_DB_TABLE_OWNER**', 'Spacewalk Database table owner', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_DB_USERNAME', '**RHN_DB_USERNAME**', 'Spacewalk database username', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_SAT_HOSTNAME', '**RHN_SAT_HOSTNAME**', 'Spacewalk hostname (FQDN)', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'RHN_SAT_WEB_PORT', '**RHN_SAT_WEB_PORT**', 'Spacewalk webserver port (80 for http, 443 for https)', '1', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SATCFGHOST', '%{RHN_SAT_HOSTNAME}', 'Satellite configuration host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'SATCFGURL', '%{SMONURL}/satconfig', 'Satellite configurator URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SCDBHOST', '%{RHN_SAT_HOSTNAME}', 'State change database host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'SCDBURL', '%{IPROTO}://%{SCDBHOST}/scdb', 'State change database URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SCDB_NAME', '%{RHN_DB_NAME}', 'State change database name', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SMONHOST', '%{RHN_SAT_HOSTNAME}', 'SMON host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SMONTEST', '%{RHN_SAT_HOSTNAME}', 'SMON-TEST host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SMONURL', '%{XPROTO}://%{SMONHOST}', 'SMON URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SMON_ADMIN_EMAIL', '%{RHN_ADMIN_EMAIL}', 'Scout administrator email', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SPREADBRIDGE_CLIENTPORT', '443', 'Spread bridge client port', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SSPUT_CRYPTKEY', '**SSPUT_CRYPTKEY**', 'SuperSput crypto key', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'SUPPORTURL', 'https://support.nocpulse.com', 'Support URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'TIMESYNC_MAXDELTA', '60', 'Maximum time skew for auto-adjustment (seconds)', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'TIMESYNC_MINDELTA', '0.3', 'Minimum time skew for auto-adjustment (seconds)', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'LICENSE', 'TSDBHOST', '%{RHN_SAT_HOSTNAME}', 'Time-series database host', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'TSDBURL', '%{IPROTO}://%{TSDBHOST}/tsdb', 'Time-series database URL', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'USER', 'nocpulse', 'Production user', '0', 'system',sysdate); -insert into rhn_config_macro(environment,name,definition,description,editable,last_update_user,last_update_date) values ( 'ALL', 'XPROTO', '**XPROTO**', 'External protocol (''http'' or ''https'')', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CCS_CRYPTKEY', '**CCS_CRYPTKEY**', 'ClusterConfigSvcs encryption key', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CFDBHOST', '%{RHN_SAT_HOSTNAME}', 'Configuration database host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CFDB_NAME', '%{RHN_DB_NAME}', 'Configuration database name', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CFDB_NOTIF_PASSWD', '%{RHN_DB_PASSWD}', 'Configuration database notification user password', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CFDB_PASSWD', '%{RHN_DB_PASSWD}', 'Configuration database password', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CSDBHOST', '%{CFDBHOST}', 'Current state database host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CSDB_NAME', '%{RHN_DB_NAME}', 'Current state database name', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'CSDB_PASSWD', '%{CFDB_PASSWD}', 'Current state database password', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'DOM', '**DOM**', 'Local host domain (e.g. ''redhat.com'')', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'EDOM', '%{DOM}', 'Environment-specific domain (e.g. ''dev.rhn_net'')', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'ENV', 'license', 'Environment (e.g. ''prod'')', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'GRITCH_TARGETCUST', '**GRITCH_TARGETCUST**', 'Administrative destination customer ID', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'GRITCH_TARGETDEST', '%{GRITCH_TARGETCUST}_%{GRITCH_TARGETDESTID}_%{GRITCH_TARGETDESTNAME}', 'Gritch target destination', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'GRITCH_TARGETDESTID', '**GRITCH_TARGETDESTID**', 'Administrative destination recid', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'GRITCH_TARGETDESTNAME', '**GRITCH_TARGETDESTNAME**', 'Administrative destination name', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'INNOVATE_LOGINDIR', 'NULL', 'Innovate login directory', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'INNOVATE_PASSWD', 'NULL', 'Innovate password', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'IPROTO', 'http', 'Internal protocol (e.g. ''http'')', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'MAIL_MX', '**MAIL_MX**', 'Local mail exchanger', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'MDOM', '**MDOM**', 'Mail domain (e.g. ''redhat.com'' for myemail(a)redhat.com)', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NOTIFDOWNEMAIL', '%{RHN_ADMIN_EMAIL}', 'Email to notif in case of notif meltdown', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NOTIFHOST', '%{RHN_SAT_HOSTNAME}', 'Notification host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NOTIFURL', '%{IPROTO}://%{NOTIFHOST}/cgi-mod-perl/enqueue.cgi', 'Notification server URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NOTIF_ADMINPORT', '%{RHN_SAT_WEB_PORT}', 'Notification administrative webserver port', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NOTIF_ADMIN_EMAIL', '%{RHN_ADMIN_EMAIL}', 'Notification administrator email', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NPBIN', '/usr/bin', 'Production user bin directory', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NPETC', '/etc/nocpulse', 'Production user etc directory', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NPHOME', '/var/lib/%{USER}', 'Production user home directory', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NPVAR', '/var/log/%{USER}', 'Production user var directory', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'NPLIB', '/var/lib/%{USER}', 'Production user data directory', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'PORTALURL', '%{XPROTO}://%{RHN_SAT_HOSTNAME}', 'Portal URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_ADMIN_EMAIL', '**RHN_ADMIN_EMAIL**', 'Spacewalk administrator email', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_DB_NAME', '**RHN_DB_NAME**', 'Spacewalk database name ', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_DB_PASSWD', '**RHN_DB_PASSWD**', 'Spacewalk database password', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_DB_TABLE_OWNER', '**RHN_DB_TABLE_OWNER**', 'Spacewalk Database table owner', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_DB_USERNAME', '**RHN_DB_USERNAME**', 'Spacewalk database username', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_SAT_HOSTNAME', '**RHN_SAT_HOSTNAME**', 'Spacewalk hostname (FQDN)', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'RHN_SAT_WEB_PORT', '**RHN_SAT_WEB_PORT**', 'Spacewalk webserver port (80 for http, 443 for https)', '1', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SATCFGHOST', '%{RHN_SAT_HOSTNAME}', 'Satellite configuration host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SATCFGURL', '%{SMONURL}/satconfig', 'Satellite configurator URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SCDBHOST', '%{RHN_SAT_HOSTNAME}', 'State change database host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SCDBURL', '%{IPROTO}://%{SCDBHOST}/scdb', 'State change database URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SCDB_NAME', '%{RHN_DB_NAME}', 'State change database name', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SMONHOST', '%{RHN_SAT_HOSTNAME}', 'SMON host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SMONTEST', '%{RHN_SAT_HOSTNAME}', 'SMON-TEST host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SMONURL', '%{XPROTO}://%{SMONHOST}', 'SMON URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SMON_ADMIN_EMAIL', '%{RHN_ADMIN_EMAIL}', 'Scout administrator email', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SPREADBRIDGE_CLIENTPORT', '443', 'Spread bridge client port', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SSPUT_CRYPTKEY', '**SSPUT_CRYPTKEY**', 'SuperSput crypto key', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'SUPPORTURL', 'https://support.nocpulse.com', 'Support URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'TIMESYNC_MAXDELTA', '60', 'Maximum time skew for auto-adjustment (seconds)', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'TIMESYNC_MINDELTA', '0.3', 'Minimum time skew for auto-adjustment (seconds)', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'TSDBHOST', '%{RHN_SAT_HOSTNAME}', 'Time-series database host', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'TSDBURL', '%{IPROTO}://%{TSDBHOST}/tsdb', 'Time-series database URL', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'USER', 'nocpulse', 'Production user', '0', 'system',sysdate); +insert into rhn_config_macro(name,definition,description,editable,last_update_user,last_update_date) values ( 'XPROTO', '**XPROTO**', 'External protocol (''http'' or ''https'')', '1', 'system',sysdate); -- --Revision 1.7 2004/07/15 00:54:11 dfaraldo diff --git a/schema/spacewalk/common/tables/rhn_config_macro.sql b/schema/spacewalk/common/tables/rhn_config_macro.sql index c8af25a..74f8c82 100644 --- a/schema/spacewalk/common/tables/rhn_config_macro.sql +++ b/schema/spacewalk/common/tables/rhn_config_macro.sql @@ -16,7 +16,6 @@ CREATE TABLE rhn_config_macro ( - environment VARCHAR2(255) NOT NULL, name VARCHAR2(255) NOT NULL, definition VARCHAR2(255), description VARCHAR2(255), @@ -30,11 +29,11 @@ ENABLE ROW MOVEMENT COMMENT ON TABLE rhn_config_macro IS 'confm configuration macro def'; -CREATE UNIQUE INDEX rhn_confm_environment_name_pk - ON rhn_config_macro (environment, name) +CREATE UNIQUE INDEX rhn_confm_name_pk + ON rhn_config_macro (name) TABLESPACE [[2m_tbs]]; ALTER TABLE rhn_config_macro - ADD CONSTRAINT rhn_confm_environment_name_pk PRIMARY KEY (environment, name); + ADD CONSTRAINT rhn_confm_name_pk PRIMARY KEY (name); commit 1a152882131be0c0dc87c918bb178b628ffd1215 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Sep 7 16:39:09 2009 +0200 476851 - removal of tables: rhn_db_environment, rhn_environment diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml b/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml deleted file mode 100644 index aa17ec8..0000000 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping -PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" -"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="com.redhat.rhn.domain.monitoring.config.DbEnvironment" - table="rhn_db_environment" > - <id name="environment" type="string" column="environment"> - <meta attribute="scope-set">protected</meta> - <generator class="assigned"/> - </id> - <property name="dbName" column="db_name" type="string" length="255" /> - </class> - <query name="DbEnvironment.loadByEnvironment"> - <![CDATA[from com.redhat.rhn.domain.monitoring.config.DbEnvironment where environment = :environment]]> - </query> - -</hibernate-mapping> diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java deleted file mode 100644 index 2f20b1a..0000000 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright (c) 2009 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.domain.monitoring.config; - - - -/** - * DbEnvironment - Class representation of the table rhn_db_environment. - * @version $Rev: 1 $ - */ -public class DbEnvironment { - - private String dbName; - private String environment; - /** - * Getter for dbName - * @return String to get - */ - public String getDbName() { - return this.dbName; - } - - /** - * Setter for dbName - * @param dbNameIn to set - */ - public void setDbName(String dbNameIn) { - this.dbName = dbNameIn; - } - - /** - * Getter for environment - * @return String to get - */ - public String getEnvironment() { - return this.environment; - } - - /** - * Setter for environment - * @param environmentIn to set - */ - public void setEnvironment(String environmentIn) { - this.environment = environmentIn; - } - -} diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java index 8fd2a02..ffbd53b 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java @@ -98,23 +98,6 @@ public class MonitoringConfigFactory extends HibernateFactory { } /** - * Make sure we have the configuration record - * for the DB Environment stored correctly - * @return boolean if it was updated correctly or not. - */ - public static boolean ensureDbEnvironmentExists() { - DbEnvironment env = null; - Map params = new HashMap(); - params.put("environment", "LICENSE"); - env = (DbEnvironment) singleton.lookupObjectByNamedQuery( - "DbEnvironment.loadByEnvironment", params); - env.setDbName(getDatabaseName()); - assert (env.getDbName() != null); - singleton.saveObject(env); - return true; - } - - /** * Get the database name being used by Hibernate. * @return String db name */ diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java index bda7b4a..e3f3f69 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java @@ -15,7 +15,6 @@ package com.redhat.rhn.domain.monitoring.config.test; import com.redhat.rhn.domain.monitoring.config.ConfigMacro; -import com.redhat.rhn.domain.monitoring.config.DbEnvironment; import com.redhat.rhn.domain.monitoring.config.MonitoringConfigFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.testing.RhnBaseTestCase; @@ -60,23 +59,5 @@ public class MonitoringConfigTest extends RhnBaseTestCase { assertNotNull(cm); } - public void testDbEnv() throws Exception { - Object o = TestUtils.lookupTestObject( - "from com.redhat.rhn.domain.monitoring.config." + - "DbEnvironment d"); - assertNotNull(o); - assertTrue(o instanceof DbEnvironment); - } - - public void testCreateDbEnv() throws Exception { - - DbEnvironment env = - (DbEnvironment) TestUtils.lookupTestObject( - "from com.redhat.rhn.domain.monitoring.config.DbEnvironment"); - assertNotNull(env); - - assertTrue(MonitoringConfigFactory.ensureDbEnvironmentExists()); - } - } diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java index 24e54ed..a269228 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java @@ -241,8 +241,6 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand // looks for a method with this name. mmc.setMethodName("Panic Destination"); mmc.storeMethod(getUser()); - boolean dbenvExists = MonitoringConfigFactory.ensureDbEnvironmentExists(); - assert (dbenvExists); //HibernateFactory.getSession().evict(scout); scouts.add(scout); } diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java index b90836c..49078cf 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java @@ -18,7 +18,6 @@ import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.monitoring.config.ConfigMacro; -import com.redhat.rhn.domain.monitoring.config.DbEnvironment; import com.redhat.rhn.domain.monitoring.config.MonitoringConfigFactory; import com.redhat.rhn.domain.monitoring.satcluster.SatCluster; import com.redhat.rhn.domain.role.RoleFactory; @@ -137,15 +136,6 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { flushAndEvict(cm); } - - String randomString = RandomStringUtils.random(4); - DbEnvironment db = (DbEnvironment) TestUtils.lookupTestObject( - "from com.redhat.rhn.domain.monitoring.config.DbEnvironment"); - assertNotNull(db); - db.setDbName(randomString); - TestUtils.saveAndFlush(db); - - cmd = new ConfigureSatelliteCommand(user) { protected Executor getExecutor() { return new TestExecutor(); @@ -162,9 +152,6 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { assertEquals(1, orgAdmin.getOrg().getMonitoringScouts().size()); // Make sure we created the gritch dest assertEquals(1, orgAdmin.getNotificationMethods().size()); - db = (DbEnvironment) TestUtils.lookupTestObject( - "from com.redhat.rhn.domain.monitoring.config.DbEnvironment"); - assertNotSame(randomString, db.getDbName()); assertNotNull(Config.get().getString(ConfigDefaults.WEB_SCOUT_SHARED_KEY)); ConfigMacro cm = MonitoringConfigFactory.lookupConfigMacroByName("MAIL_MX"); assertFalse(cm.getDefinition().startsWith("**")); diff --git a/monitoring/SatConfig/general/NOCpulse-ini b/monitoring/SatConfig/general/NOCpulse-ini index f172631..8bcd01f 100644 --- a/monitoring/SatConfig/general/NOCpulse-ini +++ b/monitoring/SatConfig/general/NOCpulse-ini @@ -103,13 +103,7 @@ if ($set_macro) { my $sql = qq| UPDATE rhn_config_macro SET definition=? - WHERE (environment, name) = ( SELECT macro.environment, macro.name - FROM db_environment dbenv, config_macro macro - WHERE UPPER(sys_context('userenv', 'db_name')) = UPPER(dbenv.db_name) - AND DECODE(macro.environment, 'ALL', dbenv.environment, - macro.environment) = dbenv.environment - AND macro.name = ? - ) + WHERE macro.name = ? |; my $sth = $ini->dbh->prepare($sql); $sth->execute($new_value, $set_macro); diff --git a/monitoring/nocpulse-common/NOCpulse.ini.txt b/monitoring/nocpulse-common/NOCpulse.ini.txt index dbad557..a770061 100644 --- a/monitoring/nocpulse-common/NOCpulse.ini.txt +++ b/monitoring/nocpulse-common/NOCpulse.ini.txt @@ -2,19 +2,14 @@ To add configuration parameters to /etc/NOCpulse.ini, you need to update the database in the usual way, in particular the following tables: - ENVIRONMENT - Lists all environments (dev, prod, etc); - - DB_ENVIRONMENT - Relates database name to environment, e.g. - 'dev01a' => 'dev' environment; - CONFIG_SECURITY_TYPE - Lists all security levels (e.g. internal, external); CONFIG_GROUP - Stores group names (formerly section headings, e.g. '[general]' became the 'general' group); CONFIG_PARAMETER - Stores config parameters (key/value pairs) for - a given security type and environment; + a given security type; - CONFIG_MACRO - Stores macros for a given environment. + CONFIG_MACRO - Stores macros. diff --git a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm index 9f9818b..8002123 100644 --- a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm +++ b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm @@ -110,11 +110,8 @@ sub fetch_macros { # Fetch macros my $sql = q{ - SELECT macro.name, macro.definition, macro.description - FROM db_environment dbenv, config_macro macro - WHERE UPPER(sys_context('userenv', 'db_name')) = UPPER(dbenv.db_name) - AND DECODE(macro.environment, 'ALL', dbenv.environment, - macro.environment) = dbenv.environment + SELECT name, definition, description + FROM config_macro }; my $list = $self->do_fetch_hash($sql); # First, create a database of unexpanded macros diff --git a/schema/spacewalk/common/data/data.deps b/schema/spacewalk/common/data/data.deps index 649e6ad..752615b 100644 --- a/schema/spacewalk/common/data/data.deps +++ b/schema/spacewalk/common/data/data.deps @@ -48,10 +48,8 @@ rhn_command_parameter :: data/rhn_semantic_data_type \ rhn_command_param_threshold :: data/rhn_command \ data/rhn_metrics \ data/rhn_threshold_type -rhn_config_macro :: data/rhn_environment rhn_config_parameter :: data/rhn_config_group \ data/rhn_config_security_type -rhn_db_environment :: data/rhn_environment rhn_metrics :: data/rhn_command_class data/rhn_units rhn_os_commands_xref :: data/rhn_command data/rhn_os rhn_schedule_days :: data/rhn_schedules diff --git a/schema/spacewalk/common/data/rhn_db_environment.sql b/schema/spacewalk/common/data/rhn_db_environment.sql deleted file mode 100644 index 603ac7a..0000000 --- a/schema/spacewalk/common/data/rhn_db_environment.sql +++ /dev/null @@ -1,44 +0,0 @@ --- --- Copyright (c) 2008 Red Hat, Inc. --- --- This software is licensed to you under the GNU General Public License, --- version 2 (GPLv2). There is NO WARRANTY for this software, express or --- implied, including the implied warranties of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 --- along with this software; if not, see --- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- --- Red Hat trademarks are not licensed under GPLv2. No permission is --- granted to use or replicate Red Hat trademarks that are incorporated --- in this software or its documentation. --- --- --- --- --- --- - ---data for rhn_db_environment - -insert into rhn_db_environment(db_name,environment) values ('WEBDEV','LICENSE'); -commit; - --- ---Revision 1.6 2004/07/15 01:14:20 dfaraldo ---Removed unused environments. --- ---Revision 1.5 2004/06/17 20:48:59 kja ---bugzilla 124970 -- _data is in for 350. --- ---Revision 1.4 2004/05/29 21:51:49 pjones ---bugzilla: none -- _data is not for 340, so says kja. --- ---Revision 1.3 2004/05/07 23:29:09 kja ---Populated the script with correct data. --- ---Revision 1.2 2004/05/04 20:03:38 kja ---Added commits. --- ---Revision 1.1 2004/04/22 17:49:49 kja ---Added data for the reference tables. --- diff --git a/schema/spacewalk/common/data/rhn_environment.sql b/schema/spacewalk/common/data/rhn_environment.sql deleted file mode 100644 index d78ab72..0000000 --- a/schema/spacewalk/common/data/rhn_environment.sql +++ /dev/null @@ -1,44 +0,0 @@ --- --- Copyright (c) 2008 Red Hat, Inc. --- --- This software is licensed to you under the GNU General Public License, --- version 2 (GPLv2). There is NO WARRANTY for this software, express or --- implied, including the implied warranties of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 --- along with this software; if not, see --- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- --- Red Hat trademarks are not licensed under GPLv2. No permission is --- granted to use or replicate Red Hat trademarks that are incorporated --- in this software or its documentation. --- --- --- --- --- --- - ---data for rhn_environment - -insert into rhn_environment(name,description) - values ( 'LICENSE','Licensed Software Model'); -insert into rhn_environment(name,description) - values ( 'ALL','All environments'); -commit; - --- ---Revision 1.5 2004/07/15 00:58:05 dfaraldo ---Removed DEV, QA, STAGE, and PROD environments. -dfaraldo --- ---Revision 1.4 2004/06/17 20:48:59 kja ---bugzilla 124970 -- _data is in for 350. --- ---Revision 1.3 2004/05/29 21:51:49 pjones ---bugzilla: none -- _data is not for 340, so says kja. --- ---Revision 1.2 2004/05/04 20:03:38 kja ---Added commits. --- ---Revision 1.1 2004/04/22 17:49:49 kja ---Added data for the reference tables. --- diff --git a/schema/spacewalk/common/tables/rhn_config_macro.sql b/schema/spacewalk/common/tables/rhn_config_macro.sql index 07d9b71..c8af25a 100644 --- a/schema/spacewalk/common/tables/rhn_config_macro.sql +++ b/schema/spacewalk/common/tables/rhn_config_macro.sql @@ -37,7 +37,4 @@ CREATE UNIQUE INDEX rhn_confm_environment_name_pk ALTER TABLE rhn_config_macro ADD CONSTRAINT rhn_confm_environment_name_pk PRIMARY KEY (environment, name); -ALTER TABLE rhn_config_macro - ADD CONSTRAINT rhn_confm_envir_environment_fk FOREIGN KEY (environment) - REFERENCES rhn_environment (name); diff --git a/schema/spacewalk/common/tables/rhn_db_environment.sql b/schema/spacewalk/common/tables/rhn_db_environment.sql deleted file mode 100644 index e922045..0000000 --- a/schema/spacewalk/common/tables/rhn_db_environment.sql +++ /dev/null @@ -1,32 +0,0 @@ --- --- Copyright (c) 2008 Red Hat, Inc. --- --- This software is licensed to you under the GNU General Public License, --- version 2 (GPLv2). There is NO WARRANTY for this software, express or --- implied, including the implied warranties of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 --- along with this software; if not, see --- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- --- Red Hat trademarks are not licensed under GPLv2. No permission is --- granted to use or replicate Red Hat trademarks that are incorporated --- in this software or its documentation. --- - - -CREATE TABLE rhn_db_environment -( - db_name VARCHAR2(20) NOT NULL - CONSTRAINT rhn_dbenv_db_name_pk PRIMARY KEY - USING INDEX TABLESPACE [[64k_tbs]], - environment VARCHAR2(255) -) -ENABLE ROW MOVEMENT -; - -COMMENT ON TABLE rhn_db_environment IS 'dbenv environments - database_names xref'; - -ALTER TABLE rhn_db_environment - ADD CONSTRAINT rhn_dbenv_envir_environment_fk FOREIGN KEY (environment) - REFERENCES rhn_environment (name); - diff --git a/schema/spacewalk/common/tables/rhn_environment.sql b/schema/spacewalk/common/tables/rhn_environment.sql deleted file mode 100644 index 840f53b..0000000 --- a/schema/spacewalk/common/tables/rhn_environment.sql +++ /dev/null @@ -1,28 +0,0 @@ --- --- Copyright (c) 2008 Red Hat, Inc. --- --- This software is licensed to you under the GNU General Public License, --- version 2 (GPLv2). There is NO WARRANTY for this software, express or --- implied, including the implied warranties of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 --- along with this software; if not, see --- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- --- Red Hat trademarks are not licensed under GPLv2. No permission is --- granted to use or replicate Red Hat trademarks that are incorporated --- in this software or its documentation. --- - - -CREATE TABLE rhn_environment -( - name VARCHAR2(255) NOT NULL - CONSTRAINT rhn_envir_name_pk PRIMARY KEY - USING INDEX TABLESPACE [[64k_tbs]], - description VARCHAR2(255) -) -ENABLE ROW MOVEMENT -; - -COMMENT ON TABLE rhn_environment IS 'envir environments:dev,qa,stage,prod,license'; - diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps index 2bae2aa..5668da7 100644 --- a/schema/spacewalk/common/tables/tables.deps +++ b/schema/spacewalk/common/tables/tables.deps @@ -261,7 +261,6 @@ rhn_command_queue_instances :: rhn_command_queue_commands rhn_command_queue_params :: rhn_command_queue_instances rhn_command_queue_sessions :: web_contact rhn_command_target :: web_customer -rhn_config_macro :: rhn_environment rhn_config_parameter :: rhn_config_group rhn_config_security_type rhn_contact_group_members :: rhn_contact_methods rhn_contact_groups rhn_contact_groups :: web_customer rhn_strategies \ @@ -269,7 +268,6 @@ rhn_contact_groups :: web_customer rhn_strategies \ rhn_contact_methods :: web_contact rhn_method_types rhn_pager_types \ rhn_sat_cluster rhn_schedules rhn_time_zone_names \ rhn_notification_formats rhnTimezone rhnUserInfo -rhn_db_environment :: rhn_environment rhn_host_check_suites :: rhn_check_suites rhn_host_probe rhn_host_monitoring :: rhn_server_monitoring_info rhn_interface_monitoring rhn_host_probe :: rhnServer rhn_probe rhn_sat_cluster diff --git a/schema/spacewalk/oracle/synonyms/db_environment.sql b/schema/spacewalk/oracle/synonyms/db_environment.sql deleted file mode 100644 index 64556e4..0000000 --- a/schema/spacewalk/oracle/synonyms/db_environment.sql +++ /dev/null @@ -1,28 +0,0 @@ --- --- Copyright (c) 2008 Red Hat, Inc. --- --- This software is licensed to you under the GNU General Public License, --- version 2 (GPLv2). There is NO WARRANTY for this software, express or --- implied, including the implied warranties of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 --- along with this software; if not, see --- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- --- Red Hat trademarks are not licensed under GPLv2. No permission is --- granted to use or replicate Red Hat trademarks that are incorporated --- in this software or its documentation. --- --- --- --- - ---create special db_environment synonyms for monitoring backend code to function as is - -create or replace synonym db_environment for rhn_db_environment; - --- --- ---Revision 1.1 2004/06/23 15:01:07 kja ---bugzilla 126465 -- fix synonyms for monitoring backend --- --- diff --git a/schema/spacewalk/oracle/synonyms/environment.sql b/schema/spacewalk/oracle/synonyms/environment.sql deleted file mode 100644 index 0d95cc6..0000000 --- a/schema/spacewalk/oracle/synonyms/environment.sql +++ /dev/null @@ -1,28 +0,0 @@ --- --- Copyright (c) 2008 Red Hat, Inc. --- --- This software is licensed to you under the GNU General Public License, --- version 2 (GPLv2). There is NO WARRANTY for this software, express or --- implied, including the implied warranties of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 --- along with this software; if not, see --- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. --- --- Red Hat trademarks are not licensed under GPLv2. No permission is --- granted to use or replicate Red Hat trademarks that are incorporated --- in this software or its documentation. --- --- --- --- - ---create special environment synonyms for monitoring backend code to function as is - -create or replace synonym environment for rhn_environment; - --- --- ---Revision 1.1 2004/06/23 15:01:07 kja ---bugzilla 126465 -- fix synonyms for monitoring backend --- --- diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 6e1299c..252a5e4 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1158,7 +1158,6 @@ sub setup_monitoring { RHN::DB->set_default_connection($connection_string); update_monitoring_config($answers, \%mon_config); - update_monitoring_environment($answers); # Bugzilla 466747: On s390x, stty: standard input: Bad file descriptor # For some reason DBI mistakenly sets FD_CLOEXEC on a stdin file descriptor @@ -1171,38 +1170,6 @@ sub setup_monitoring { return 1; } -sub update_monitoring_environment { - my $answers = shift; - - my $dbh = Spacewalk::Setup::get_dbh($answers); - - my $db_name = $answers->{'db-sid'}; - if ($answers->{'db-backend'} eq 'oracle') { - # BZ 226915 we cannot use db_name from %answers - it contains instance name - # we want real db name - ($db_name) = $dbh->selectrow_array(q|SELECT UPPER(sys_context('userenv', 'db_name')) FROM dual|); - } - - my $sth = $dbh->prepare(<<EOQ); -UPDATE rhn_db_environment - SET db_name = UPPER(?) - WHERE environment = 'LICENSE' -EOQ - - $sth->execute($db_name); - - if ($DEBUG) { - $dbh->rollback(); - } - else { - $dbh->commit(); - } - - $dbh->disconnect(); - - return 1; -} - sub update_monitoring_config { my $answers = shift; my $mon_config = shift; diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl index 61b1ef1..ad9a467 100644 --- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl +++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl @@ -115,9 +115,6 @@ my %mon_config = RHN::SatInstall->update_monitoring_config(\%mon_config); -my $dbname = $mon_config{RHN_DB_NAME}; -RHN::SatInstall->update_monitoring_environment($dbname); - print "Restarting satellite services\n"; system("/usr/sbin/rhn-satellite", "restart"); diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml index a39c62c..68b9812 100644 --- a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml +++ b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml @@ -229,12 +229,8 @@ SELECT macro.name, macro.description, macro.last_update_user, TO_CHAR(macro.last_update_date, 'YYYY-MM-DD HH24:MI:SS') AS last_update_date -FROM db_environment dbenv, config_macro macro +FROM config_macro macro WHERE macro.editable = 1 -AND dbenv.db_name = UPPER(sys_context('userenv', 'db_name')) -AND dbenv.environment = DECODE(macro.environment, - 'ALL', dbenv.environment, - macro.environment) </query> </mode> diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm index 873d05d..aa30940 100644 --- a/web/modules/rhn/RHN/DB/SatInstall.pm +++ b/web/modules/rhn/RHN/DB/SatInstall.pm @@ -334,27 +334,6 @@ EOQ return; } -sub update_monitoring_environment { - my $class = shift; - - my $dbh = RHN::DB->connect; - # BZ 226915 we cannot use db_name from %answers - it contains instance name - # we want real db name - my ($db_name) = $dbh->selectrow_array(q|SELECT UPPER(sys_context('userenv', 'db_name')) FROM dual|); - - my $sth = $dbh->prepare(<<EOQ); -UPDATE rhn_db_environment - SET db_name = UPPER(:db_name) - WHERE environment = 'LICENSE' -EOQ - - $sth->execute_h(db_name => $db_name); - - $dbh->commit; - - return; -} - sub create_satellite_org { my $class = shift; my $org_name = shift;

1 0

Changes to 'refs/tags/oracle-lib-compat-10.2-21'
by Michael Mraka 09 Sep '09

09 Sep '09

Tag 'oracle-lib-compat-10.2-21' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-09 13:24 +0000 Tagging package [oracle-lib-compat] version [10.2-21] in directory [spec-tree/oracle-lib-compat/]. Changes since rhn-client-tools-0.7.2-1: Michael Mraka (4): fixed check_users_exist, check_groups_exist - only first user/group was checked 506951 - clear exec stack on instantclient libs (fixes selinux avc denial) 506951 - execstack -c moved to instantclient packages Automatic commit of package [oracle-lib-compat] minor release [10.2-21]. --- rel-eng/packages/oracle-lib-compat | 2 - selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 12 +++------- spacewalk/setup/lib/Spacewalk/Setup.pm | 4 +-- spec-tree/oracle-lib-compat/oracle-lib-compat.spec | 10 +++++++- 4 files changed, 16 insertions(+), 12 deletions(-) ---

1 0

Changes to 'refs/tags/oracle-instantclient-selinux-10.2-16'
by Michael Mraka 09 Sep '09

09 Sep '09

Tag 'oracle-instantclient-selinux-10.2-16' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-09 13:25 +0000 Tagging package [oracle-instantclient-selinux] version [10.2-16] in directory [selinux/oracle-instantclient-selinux/]. Changes since rhn-client-tools-0.7.2-1: Michael Mraka (5): fixed check_users_exist, check_groups_exist - only first user/group was checked 506951 - clear exec stack on instantclient libs (fixes selinux avc denial) 506951 - execstack -c moved to instantclient packages Automatic commit of package [oracle-lib-compat] minor release [10.2-21]. Automatic commit of package [oracle-instantclient-selinux] minor release [10.2-16]. --- rel-eng/packages/oracle-instantclient-selinux | 2 - rel-eng/packages/oracle-lib-compat | 2 - selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 17 ++++------ spacewalk/setup/lib/Spacewalk/Setup.pm | 4 +- spec-tree/oracle-lib-compat/oracle-lib-compat.spec | 10 +++++ 5 files changed, 21 insertions(+), 14 deletions(-) ---

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits September 2009