backend/LICENSE | 339 ++++++++++
backend/logrotate/Makefile | 2
backend/logrotate/rhn_config_management | 13
backend/logrotate/rhn_config_management_tool | 13
backend/logrotate/rhn_package_push | 13
backend/logrotate/rhn_package_upload | 13
backend/logrotate/rhn_sat_export_internal | 12
backend/logrotate/rhn_server | 13
backend/logrotate/rhn_server_app | 13
backend/logrotate/rhn_server_applet | 13
backend/logrotate/rhn_server_sat | 12
backend/logrotate/rhn_server_satellite | 13
backend/logrotate/rhn_server_xmlrpc | 13
backend/logrotate/rhn_server_xp | 13
backend/logrotate/spacewalk-backend-app | 13
backend/logrotate/spacewalk-backend-applet | 13
backend/logrotate/spacewalk-backend-config-files | 13
backend/logrotate/spacewalk-backend-config-files-tool | 13
backend/logrotate/spacewalk-backend-iss | 12
backend/logrotate/spacewalk-backend-iss-export | 11
backend/logrotate/spacewalk-backend-package-push-server | 13
backend/logrotate/spacewalk-backend-server | 13
backend/logrotate/spacewalk-backend-tools | 23
backend/logrotate/spacewalk-backend-upload-server | 13
backend/logrotate/spacewalk-backend-xmlrpc | 13
backend/logrotate/spacewalk-backend-xp | 13
backend/satellite_exporter/handlers/non_auth_dumper.py | 1
backend/satellite_exporter/satexport.py | 1
backend/satellite_tools/Makefile | 4
backend/satellite_tools/connection.py | 1
backend/satellite_tools/diskImportLib.py | 1
backend/satellite_tools/disk_dumper/dumper.py | 1
backend/satellite_tools/disk_dumper/iss.py | 1
backend/satellite_tools/disk_dumper/string_buffer.py | 1
backend/satellite_tools/exporter/exportLib.py | 1
backend/satellite_tools/exporter/exporter.py | 1
backend/satellite_tools/exporter/xmlWriter.py | 1
backend/satellite_tools/geniso.py | 1
backend/satellite_tools/gentree.py | 2
backend/satellite_tools/messages.py | 1
backend/satellite_tools/repo_plugins/yum_src.py | 1
backend/satellite_tools/reposync.py | 1
backend/satellite_tools/req_channels.py | 2
backend/satellite_tools/rhn-entitlement-report | 81 ++
backend/satellite_tools/rhn-entitlement-report.py | 84 --
backend/satellite_tools/satCerts.py | 1
backend/satellite_tools/satComputePkgHeaders.py | 1
backend/satellite_tools/spacewalk-debug | 4
backend/satellite_tools/sync_handlers.py | 2
backend/satellite_tools/updatePackages.py | 1
backend/satellite_tools/xmlDiskDumper.py | 2
backend/satellite_tools/xmlDiskSource.py | 1
backend/satellite_tools/xmlSource.py | 1
backend/server/apacheUploadServer.py | 1
backend/server/basePackageUpload.py | 1
backend/server/configFilesHandler.py | 1
backend/server/config_common/base_templated_document.py | 1
backend/server/config_common/templated_document.py | 1
backend/server/handlers/app/packages.py | 1
backend/server/handlers/app/rhn_mpm.py | 1
backend/server/handlers/applet/__init__.py | 1
backend/server/handlers/config/rhn_config_management.py | 1
backend/server/handlers/config_mgmt/rhn_config_management.py | 1
backend/server/handlers/sat/get_handler.py | 1
backend/server/handlers/xmlrpc/getMethod.py | 1
backend/server/handlers/xp/packages.py | 1
backend/server/importlib/archImport.py | 3
backend/server/importlib/backend.py | 1
backend/server/importlib/backendLib.py | 1
backend/server/importlib/backendOracle.py | 1
backend/server/importlib/blacklistImport.py | 1
backend/server/importlib/debPackage.py | 1
backend/server/importlib/errataCache.py | 1
backend/server/importlib/errataImport.py | 1
backend/server/importlib/headerSource.py | 1
backend/server/importlib/importLib.py | 1
backend/server/importlib/kickstartImport.py | 1
backend/server/importlib/mpmSource.py | 1
backend/server/importlib/packageImport.py | 1
backend/server/importlib/packageUpload.py | 1
backend/server/importlib/productNamesImport.py | 4
backend/server/importlib/userAuth.py | 1
backend/server/rhnAction.py | 1
backend/server/rhnAuthPAM.py | 1
backend/server/rhnDatabaseCache.py | 1
backend/server/rhnPackageUpload.py | 1
backend/server/rhnSQL/driver_cx_Oracle.py | 1
backend/server/rhnSQL/driver_postgresql.py | 1
backend/server/rhnSQL/sql_lib.py | 1
backend/server/rhnSQL/sql_types.py | 1
backend/server/rhnServer/satellite_cert.py | 1
backend/server/rhnServer/search_notify.py | 1
backend/server/rhnServer/server_certificate.py | 1
backend/server/rhnServer/server_hardware.py | 1
backend/server/rhnServer/server_kickstart.py | 1
backend/server/rhnServer/server_packages.py | 4
backend/server/rhnServer/server_route.py | 1
backend/server/rhnVirtualization.py | 1
backend/server/taskomatic.py | 1
backend/spacewalk-backend.spec | 165 +++-
backend/upload_server/handlers/package_push/__init__.py | 1
backend/upload_server/handlers/package_push/package_push.py | 1
backend/upload_server/handlers/package_upload/__init__.py | 1
backend/upload_server/handlers/package_upload/package_upload.py | 1
104 files changed, 697 insertions(+), 384 deletions(-)
New commits:
commit 1f2b178be356ac3861eb7bd956e1235a26cf8c61
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 10:12:04 2010 +0200
wrap long lines
addressing rpmlint errors:
spacewalk-backend-sql.noarch: E: description-line-too-long C This package contains the
basic code that provides SQL connectivity for the Spacewalk
spacewalk-backend-sql-oracle.noarch: E: description-line-too-long C This package
contains provides Oracle connectivity for the Spacewalk backend modules.
spacewalk-backend-sql-postgresql.noarch: E: description-line-too-long C This package
contains provides PostgreSQL connectivity for the Spacewalk backend modules.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index aff5607..06d20a6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -51,8 +51,8 @@ Requires: %{name}-sql-oracle = %{version}-%{release}
Requires: %{name}-sql-postgresql = %{version}-%{release}
%description sql
-This package contains the basic code that provides SQL connectivity for the Spacewalk
-backend modules.
+This package contains the basic code that provides SQL connectivity for
+the Spacewalk backend modules.
%package sql-oracle
Summary: Oracle backend for Spacewalk
@@ -60,7 +60,8 @@ Group: Applications/Internet
Requires: python(:DBAPI:oracle)
%description sql-oracle
-This package contains provides Oracle connectivity for the Spacewalk backend modules.
+This package contains provides Oracle connectivity for the Spacewalk backend
+modules.
%package sql-postgresql
Summary: Postgresql backend for Spacewalk
@@ -68,7 +69,8 @@ Group: Applications/Internet
Requires: python-pgsql
%description sql-postgresql
-This package contains provides PostgreSQL connectivity for the Spacewalk backend
modules.
+This package contains provides PostgreSQL connectivity for the Spacewalk
+backend modules.
%package server
Summary: Basic code that provides RHN Server functionality
commit c30010ed9d39d5f6f0096fd48c927a646984e30d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 10:03:38 2010 +0200
remove shebang from modules
modules are not executable and executables should be in /usr/bin
addressing rpmlint errors:
spacewalk-backend-app.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/app/packages.py 0664L /usr/bin/python
spacewalk-backend-app.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/app/rhn_mpm.py 0664L /usr/bin/python
spacewalk-backend-applet.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/applet/__init__.py 0664L /usr/bin/python
spacewalk-backend-config-files.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/config/rhn_config_management.py 0664L /usr/bin/python
spacewalk-backend-config-files-common.noarch: E: non-executable-script
/usr/share/rhn/server/config_common/templated_document.py 0664L /usr/bin/python
spacewalk-backend-config-files-common.noarch: E: non-executable-script
/usr/share/rhn/server/configFilesHandler.py 0664L /usr/bin/python
spacewalk-backend-config-files-common.noarch: E: non-executable-script
/usr/share/rhn/server/config_common/base_templated_document.py 0664L /usr/bin/python
spacewalk-backend-config-files-tool.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/config_mgmt/rhn_config_management.py 0664L /usr/bin/python
spacewalk-backend-iss.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/sat/get_handler.py 0664L /usr/bin/python
spacewalk-backend-iss-export.noarch: E: non-executable-script
/usr/share/rhn/satellite_exporter/satexport.py 0664L /usr/bin/python
spacewalk-backend-iss-export.noarch: E: non-executable-script
/usr/share/rhn/satellite_exporter/handlers/non_auth_dumper.py 0664L /usr/bin/python
spacewalk-backend-package-push-server.noarch: E: non-executable-script
/usr/share/rhn/upload_server/handlers/package_push/package_push.py 0664L /usr/bin/python
spacewalk-backend-package-push-server.noarch: E: non-executable-script
/usr/share/rhn/upload_server/handlers/package_push/__init__.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/server_certificate.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/server_route.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/blacklistImport.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/packageImport.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/backendLib.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/search_notify.py 0664L /usr/bin/env
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/importLib.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/taskomatic.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/apacheUploadServer.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/packageUpload.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnAuthPAM.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/userAuth.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnPackageUpload.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnAction.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnVirtualization.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/errataCache.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/productNamesImport.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/server_kickstart.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/backendOracle.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/headerSource.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/server_packages.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/basePackageUpload.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/errataImport.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/archImport.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnDatabaseCache.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/mpmSource.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/satellite_cert.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/backend.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/kickstartImport.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/importlib/debPackage.py 0664L /usr/bin/python
spacewalk-backend-server.noarch: E: non-executable-script
/usr/share/rhn/server/rhnServer/server_hardware.py 0664L /usr/bin/python
spacewalk-backend-sql.noarch: E: non-executable-script
/usr/share/rhn/server/rhnSQL/sql_lib.py 0664L /usr/bin/python
spacewalk-backend-sql.noarch: E: non-executable-script
/usr/share/rhn/server/rhnSQL/sql_types.py 0664L /usr/bin/python
spacewalk-backend-sql-oracle.noarch: E: non-executable-script
/usr/share/rhn/server/rhnSQL/driver_cx_Oracle.py 0664L /usr/bin/python
spacewalk-backend-sql-postgresql.noarch: E: non-executable-script
/usr/share/rhn/server/rhnSQL/driver_postgresql.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/repo_plugins/yum_src.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/reposync.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/sync_handlers.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/disk_dumper/dumper.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/satComputePkgHeaders.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/disk_dumper/string_buffer.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/disk_dumper/iss.py 0664L /bin/env
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/req_channels.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/satCerts.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/updatePackages.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/messages.py 0664L /usr/bin/python
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/rhn-entitlement-report.py 0664L /usr/bin/python
spacewalk-backend-upload-server.noarch: E: non-executable-script
/usr/share/rhn/upload_server/handlers/package/__init__.py 0664L /usr/bin/python
spacewalk-backend-upload-server.noarch: E: non-executable-script
/usr/share/rhn/upload_server/handlers/package/package_upload.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/geniso.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/xmlSource.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/gentree.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/exporter/xmlWriter.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/exporter/exportLib.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/connection.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/xmlDiskSource.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/diskImportLib.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/exporter/exporter.py 0664L /usr/bin/python
spacewalk-backend-xml-export-libs.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/xmlDiskDumper.py 0664L /usr/bin/python
spacewalk-backend-xmlrpc.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/xmlrpc/get_handler.py 0664L /usr/bin/python
spacewalk-backend-xmlrpc.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/xmlrpc/getMethod.py 0664L /usr/bin/python
spacewalk-backend-xp.noarch: E: non-executable-script
/usr/share/rhn/server/handlers/xp/packages.py 0664L /usr/bin/python
diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py
b/backend/satellite_exporter/handlers/non_auth_dumper.py
index e52f93a..7adf620 100644
--- a/backend/satellite_exporter/handlers/non_auth_dumper.py
+++ b/backend/satellite_exporter/handlers/non_auth_dumper.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# Copyright (c) 2008--2010 Red Hat, Inc.
#
# This software is licensed to you under the GNU General Public License,
diff --git a/backend/satellite_exporter/satexport.py
b/backend/satellite_exporter/satexport.py
index 58ea591..95b38d0 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008-2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/Makefile b/backend/satellite_tools/Makefile
index a78da4f..4b61e1c 100644
--- a/backend/satellite_tools/Makefile
+++ b/backend/satellite_tools/Makefile
@@ -9,12 +9,12 @@ SUBDIR = satellite_tools
SUBDIRS = exporter disk_dumper accounts repo_plugins
FILES = __init__ connection constants diskImportLib messages \
progress_bar req_channels satCerts satsync syncCache \
- sync_handlers rhn-entitlement-report\
+ sync_handlers \
syncLib SequenceServer xmlDiskDumper xmlDiskSource \
xmlSource xmlWireSource rhn_satellite_activate rhn_ssl_dbstore \
satComputePkgHeaders updatePackages reposync updateSignatures
-SCRIPTS = satellite-sync spacewalk-debug\
+SCRIPTS = satellite-sync spacewalk-debug rhn-entitlement-report \
rhn-schema-version rhn-satellite-activate rhn-charsets \
rhn-ssl-dbstore update-packages rhn-db-stats rhn-schema-stats \
spacewalk-repo-sync spacewalk-remove-channel
diff --git a/backend/satellite_tools/connection.py
b/backend/satellite_tools/connection.py
index 1ee838e..5836c58 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Module that provides the client-side functionality for an XML importer
#
diff --git a/backend/satellite_tools/diskImportLib.py
b/backend/satellite_tools/diskImportLib.py
index c705c3a..5a132dc 100644
--- a/backend/satellite_tools/diskImportLib.py
+++ b/backend/satellite_tools/diskImportLib.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Common dumper stuff
#
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 1d696a9..832639a 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/disk_dumper/iss.py
b/backend/satellite_tools/disk_dumper/iss.py
index c9e2b02..66acbbe 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -1,4 +1,3 @@
-#!/bin/env python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/disk_dumper/string_buffer.py
b/backend/satellite_tools/disk_dumper/string_buffer.py
index 366690e..7ac482d 100644
--- a/backend/satellite_tools/disk_dumper/string_buffer.py
+++ b/backend/satellite_tools/disk_dumper/string_buffer.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/exporter/exportLib.py
b/backend/satellite_tools/exporter/exportLib.py
index 55a2872..44476da 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/exporter/exporter.py
b/backend/satellite_tools/exporter/exporter.py
index 2d2f948..356710a 100644
--- a/backend/satellite_tools/exporter/exporter.py
+++ b/backend/satellite_tools/exporter/exporter.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/exporter/xmlWriter.py
b/backend/satellite_tools/exporter/xmlWriter.py
index b0ccdfd..c79fda3 100644
--- a/backend/satellite_tools/exporter/xmlWriter.py
+++ b/backend/satellite_tools/exporter/xmlWriter.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: ISO-8859-1 -*-
#
# Copyright (c) 2008--2010 Red Hat, Inc.
diff --git a/backend/satellite_tools/geniso.py b/backend/satellite_tools/geniso.py
index 33f1f17..9910041 100644
--- a/backend/satellite_tools/geniso.py
+++ b/backend/satellite_tools/geniso.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/gentree.py b/backend/satellite_tools/gentree.py
index 3e28e3a..186646b 100644
--- a/backend/satellite_tools/gentree.py
+++ b/backend/satellite_tools/gentree.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/messages.py b/backend/satellite_tools/messages.py
index 002c0a9..e490bfb 100644
--- a/backend/satellite_tools/messages.py
+++ b/backend/satellite_tools/messages.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py
b/backend/satellite_tools/repo_plugins/yum_src.py
index c9ed24c..97dab39 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python -u
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 7ba7e54..8000dc5 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python -u
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/req_channels.py
b/backend/satellite_tools/req_channels.py
index 4ae3163..fb7702e 100644
--- a/backend/satellite_tools/req_channels.py
+++ b/backend/satellite_tools/req_channels.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/rhn-entitlement-report
b/backend/satellite_tools/rhn-entitlement-report
new file mode 100755
index 0000000..62e055a
--- /dev/null
+++ b/backend/satellite_tools/rhn-entitlement-report
@@ -0,0 +1,81 @@
+#!/usr/bin/python
+
+import sys
+import getopt
+from pprint import pprint
+
+sys.path.append('/usr/share/rhn')
+try:
+ from server import rhnSQL
+ from common import initCFG, CFG
+except:
+ print "Couldn't load needed libs, Are you sure you are running this on a
satellite?"
+ sys.exit(1)
+
+
+
+initCFG()
+db_string = CFG.DEFAULT_DB
+rhnSQL.initDB(db_string)
+
+def main():
+ list = listOfOrgs()
+ for org in list:
+ printOrgHeader(org);
+ printSystemEnts(org['id']);
+ printChannelEnts(org['id']);
+ printOrgFooter()
+
+
+def printOrgHeader(org):
+ print("\n")
+ print("="*40)
+ print(org['name'] + " (" + str(org['id']) +
"):\n")
+
+
+def printOrgFooter():
+ print("="*40)
+ print("\n")
+
+
+def printChannelEnts(id):
+ query = "select CF.label, PCF.current_members from rhnChannelFamily CF inner join
rhnPrivateChannelFamily PCF on CF.id = PCF.channel_family_id where PCF.org_id = %d order
by CF.label" % (id)
+ list = run_query(query)
+ print("%35s %s" % ("Channel Entitelment", "Used"))
+ print("%35s %s" % ("-------------------", "----"))
+ if list == None:
+ print("")
+ return
+ for item in list:
+ if item['current_members'] != 0:
+ print("%35s %s" % (item['label'],
str(item['current_members'])))
+ print("")
+ return
+
+def printSystemEnts(id):
+ print("%35s %s" % ("System Entitelment", "Used"))
+ print("%35s %s" % ("------------------", "----"))
+ query = """select T.label, G.current_members
+ from rhnServerGroup G inner join rhnServerGroupType T on G.group_type =
T.id
+ where org_id = %d order by T.label """ % (id)
+ list = run_query(query)
+ for item in list:
+ print("%35s %s" % (item['label'],
str(item['current_members'])))
+ print("")
+ return
+
+
+
+def listOfOrgs():
+ query = "select id, name from web_customer"
+ return run_query(query)
+
+def run_query(query):
+ _get_data_sql = rhnSQL.prepare(query)
+ _get_data_sql.execute()
+ return _get_data_sql.fetchall_dict()
+
+
+
+if __name__ == "__main__":
+ main()
diff --git a/backend/satellite_tools/rhn-entitlement-report.py
b/backend/satellite_tools/rhn-entitlement-report.py
deleted file mode 100644
index 79667d3..0000000
--- a/backend/satellite_tools/rhn-entitlement-report.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import getopt
-from pprint import pprint
-
-sys.path.append('/usr/share/rhn')
-try:
- from server import rhnSQL
- from common import initCFG, CFG
-except:
- print "Couldn't load needed libs, Are you sure you are running this on a
satellite?"
- sys.exit(1)
-
-
-
-initCFG()
-db_string = CFG.DEFAULT_DB
-rhnSQL.initDB(db_string)
-
-def main():
- list = listOfOrgs()
- for org in list:
- printOrgHeader(org);
- printSystemEnts(org['id']);
- printChannelEnts(org['id']);
- printOrgFooter()
-
-
-def printOrgHeader(org):
- print("\n")
- print("="*40)
- print(org['name'] + " (" + str(org['id']) +
"):\n")
-
-
-def printOrgFooter():
- print("="*40)
- print("\n")
-
-
-def printChannelEnts(id):
- query = "select CF.label, PCF.current_members from rhnChannelFamily CF inner join
rhnPrivateChannelFamily PCF on CF.id = PCF.channel_family_id where PCF.org_id = %d order
by CF.label" % (id)
- list = run_query(query)
- print("%35s %s" % ("Channel Entitelment", "Used"))
- print("%35s %s" % ("-------------------", "----"))
- if list == None:
- print("")
- return
- for item in list:
- if item['current_members'] != 0:
- print("%35s %s" % (item['label'],
str(item['current_members'])))
- print("")
- return
-
-def printSystemEnts(id):
- print("%35s %s" % ("System Entitelment", "Used"))
- print("%35s %s" % ("------------------", "----"))
- query = """select T.label, G.current_members
- from rhnServerGroup G inner join rhnServerGroupType T on G.group_type =
T.id
- where org_id = %d order by T.label """ % (id)
- list = run_query(query)
- for item in list:
- print("%35s %s" % (item['label'],
str(item['current_members'])))
- print("")
- return
-
-
-
-def listOfOrgs():
- query = "select id, name from web_customer"
- return run_query(query)
-
-def run_query(query):
- _get_data_sql = rhnSQL.prepare(query)
- _get_data_sql.execute()
- return _get_data_sql.fetchall_dict()
-
-
-
-if __name__ == "__main__":
- main()
-
-
-
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py
index 5632f33..dee5189 100644
--- a/backend/satellite_tools/satCerts.py
+++ b/backend/satellite_tools/satCerts.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Cert-related functions
# - RHN certificate
diff --git a/backend/satellite_tools/satComputePkgHeaders.py
b/backend/satellite_tools/satComputePkgHeaders.py
index 6f55305..c8e0fc1 100644
--- a/backend/satellite_tools/satComputePkgHeaders.py
+++ b/backend/satellite_tools/satComputePkgHeaders.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/spacewalk-debug
b/backend/satellite_tools/spacewalk-debug
index 457c671..6f1dadb 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -125,8 +125,8 @@ for tomcat in tomcat5 tomcat6 ; do
done
#entitlement report
-if [ -e /usr/share/rhn/satellite_tools/rhn-entitlement-report.py ]; then
- python /usr/share/rhn/satellite_tools/rhn-entitlement-report.py &>
$DIR/entitlement-report
+if [ -x /usr/bin/rhn-entitlement-report ]; then
+ /usr/bin/rhn-entitlement-report &> $DIR/entitlement-report
fi
#cobbler stuff
diff --git a/backend/satellite_tools/sync_handlers.py
b/backend/satellite_tools/sync_handlers.py
index bc76ec2..efae0d4 100644
--- a/backend/satellite_tools/sync_handlers.py
+++ b/backend/satellite_tools/sync_handlers.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/updatePackages.py
b/backend/satellite_tools/updatePackages.py
index 7326aac..9ce5ae3 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/xmlDiskDumper.py
b/backend/satellite_tools/xmlDiskDumper.py
index 2e9f323..53ce01a 100644
--- a/backend/satellite_tools/xmlDiskDumper.py
+++ b/backend/satellite_tools/xmlDiskDumper.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/satellite_tools/xmlDiskSource.py
b/backend/satellite_tools/xmlDiskSource.py
index 7907420..e71935b 100644
--- a/backend/satellite_tools/xmlDiskSource.py
+++ b/backend/satellite_tools/xmlDiskSource.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Abstraction for an XML importer with a disk base
#
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 4b77fbd..6d9d5c5 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Decoding data from XML streams
#
diff --git a/backend/server/apacheUploadServer.py b/backend/server/apacheUploadServer.py
index b1c6aad..0d37e52 100644
--- a/backend/server/apacheUploadServer.py
+++ b/backend/server/apacheUploadServer.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/basePackageUpload.py b/backend/server/basePackageUpload.py
index c7e4237..955d948 100644
--- a/backend/server/basePackageUpload.py
+++ b/backend/server/basePackageUpload.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index 3882a70..c805223 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/config_common/base_templated_document.py
b/backend/server/config_common/base_templated_document.py
index 65220ad..c977185 100644
--- a/backend/server/config_common/base_templated_document.py
+++ b/backend/server/config_common/base_templated_document.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/config_common/templated_document.py
b/backend/server/config_common/templated_document.py
index b9b6464..98a3932 100644
--- a/backend/server/config_common/templated_document.py
+++ b/backend/server/config_common/templated_document.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/handlers/app/packages.py
b/backend/server/handlers/app/packages.py
index a59d0ae..9560d50 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/handlers/app/rhn_mpm.py
b/backend/server/handlers/app/rhn_mpm.py
index cb54d54..49cefb9 100644
--- a/backend/server/handlers/app/rhn_mpm.py
+++ b/backend/server/handlers/app/rhn_mpm.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/handlers/applet/__init__.py
b/backend/server/handlers/applet/__init__.py
index 5cf72e9..0244b41 100644
--- a/backend/server/handlers/applet/__init__.py
+++ b/backend/server/handlers/applet/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/handlers/config/rhn_config_management.py
b/backend/server/handlers/config/rhn_config_management.py
index 8b5b716..5b89e67 100644
--- a/backend/server/handlers/config/rhn_config_management.py
+++ b/backend/server/handlers/config/rhn_config_management.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py
b/backend/server/handlers/config_mgmt/rhn_config_management.py
index 0f8595d..c7ec9f5 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/handlers/sat/get_handler.py
b/backend/server/handlers/sat/get_handler.py
index 9b50d06..4fff0eb 100644
--- a/backend/server/handlers/sat/get_handler.py
+++ b/backend/server/handlers/sat/get_handler.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/handlers/xmlrpc/getMethod.py
b/backend/server/handlers/xmlrpc/getMethod.py
index ba6c76c..ce2fc06 100644
--- a/backend/server/handlers/xmlrpc/getMethod.py
+++ b/backend/server/handlers/xmlrpc/getMethod.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# Retrieve action method name given queued action information.
#
# Client code for Update Agent
diff --git a/backend/server/handlers/xp/packages.py
b/backend/server/handlers/xp/packages.py
index e5bbf02..c6f2b42 100644
--- a/backend/server/handlers/xp/packages.py
+++ b/backend/server/handlers/xp/packages.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/importlib/archImport.py
b/backend/server/importlib/archImport.py
index ffdb0d4..2df3fef 100644
--- a/backend/server/importlib/archImport.py
+++ b/backend/server/importlib/archImport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
@@ -136,5 +135,3 @@ class ServerGroupServerArchCompatImport(BaseArchCompatImport):
submit_method_name = 'processServerGroupServerArchCompatMap'
virt_sub_level = 'virt_sub_level'
-if __name__ == '__main__':
- pass
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 3e68e2c..33a6b75 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/backendLib.py
b/backend/server/importlib/backendLib.py
index 260b2e5..34b66be 100644
--- a/backend/server/importlib/backendLib.py
+++ b/backend/server/importlib/backendLib.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/backendOracle.py
b/backend/server/importlib/backendOracle.py
index 38f27af..0d88364 100644
--- a/backend/server/importlib/backendOracle.py
+++ b/backend/server/importlib/backendOracle.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python -v
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/blacklistImport.py
b/backend/server/importlib/blacklistImport.py
index 5eda6b3..951d9bb 100644
--- a/backend/server/importlib/blacklistImport.py
+++ b/backend/server/importlib/blacklistImport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/importlib/debPackage.py
b/backend/server/importlib/debPackage.py
index 7417e95..8b050ec 100644
--- a/backend/server/importlib/debPackage.py
+++ b/backend/server/importlib/debPackage.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/errataCache.py
b/backend/server/importlib/errataCache.py
index 38a527b..0e51262 100644
--- a/backend/server/importlib/errataCache.py
+++ b/backend/server/importlib/errataCache.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/importlib/errataImport.py
b/backend/server/importlib/errataImport.py
index 9eaf993..aecf24a 100644
--- a/backend/server/importlib/errataImport.py
+++ b/backend/server/importlib/errataImport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/headerSource.py
b/backend/server/importlib/headerSource.py
index b4b12b4..45fa1f2 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/importLib.py
b/backend/server/importlib/importLib.py
index 2c188ff..8f8dfdb 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/kickstartImport.py
b/backend/server/importlib/kickstartImport.py
index 2a00f67..c50489d 100644
--- a/backend/server/importlib/kickstartImport.py
+++ b/backend/server/importlib/kickstartImport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/mpmSource.py
b/backend/server/importlib/mpmSource.py
index 4bc27a4..52f51fe 100644
--- a/backend/server/importlib/mpmSource.py
+++ b/backend/server/importlib/mpmSource.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index 114e207..68a744a 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/packageUpload.py
b/backend/server/importlib/packageUpload.py
index 5099567..b997585 100644
--- a/backend/server/importlib/packageUpload.py
+++ b/backend/server/importlib/packageUpload.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/importlib/productNamesImport.py
b/backend/server/importlib/productNamesImport.py
index cc883c0..e2cf7fa 100644
--- a/backend/server/importlib/productNamesImport.py
+++ b/backend/server/importlib/productNamesImport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
@@ -36,6 +35,3 @@ class ProductNamesImport(Import):
raise
self.backend.commit()
-
-if __name__ == '__main__':
- pass
diff --git a/backend/server/importlib/userAuth.py b/backend/server/importlib/userAuth.py
index ead31f9..be82161 100644
--- a/backend/server/importlib/userAuth.py
+++ b/backend/server/importlib/userAuth.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 8a1e94b..2b83f25 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnAuthPAM.py b/backend/server/rhnAuthPAM.py
index 0f4fa29..f610784 100644
--- a/backend/server/rhnAuthPAM.py
+++ b/backend/server/rhnAuthPAM.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnDatabaseCache.py b/backend/server/rhnDatabaseCache.py
index 8deeb4c..5737b45 100644
--- a/backend/server/rhnDatabaseCache.py
+++ b/backend/server/rhnDatabaseCache.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index 6c3e3a6..61f40bb 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py
b/backend/server/rhnSQL/driver_cx_Oracle.py
index 719ca38..07e217f 100644
--- a/backend/server/rhnSQL/driver_cx_Oracle.py
+++ b/backend/server/rhnSQL/driver_cx_Oracle.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnSQL/driver_postgresql.py
b/backend/server/rhnSQL/driver_postgresql.py
index 73b113f..1c69846 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnSQL/sql_lib.py b/backend/server/rhnSQL/sql_lib.py
index c9f1711..013b6f3 100644
--- a/backend/server/rhnSQL/sql_lib.py
+++ b/backend/server/rhnSQL/sql_lib.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnSQL/sql_types.py b/backend/server/rhnSQL/sql_types.py
index e643adb..6511040 100644
--- a/backend/server/rhnSQL/sql_types.py
+++ b/backend/server/rhnSQL/sql_types.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnServer/satellite_cert.py
b/backend/server/rhnServer/satellite_cert.py
index 121959a..c3c660a 100644
--- a/backend/server/rhnServer/satellite_cert.py
+++ b/backend/server/rhnServer/satellite_cert.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnServer/search_notify.py
b/backend/server/rhnServer/search_notify.py
index 87bec21..fea0b46 100755
--- a/backend/server/rhnServer/search_notify.py
+++ b/backend/server/rhnServer/search_notify.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnServer/server_certificate.py
b/backend/server/rhnServer/server_certificate.py
index 17124e0..ddf2a0d 100644
--- a/backend/server/rhnServer/server_certificate.py
+++ b/backend/server/rhnServer/server_certificate.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnServer/server_hardware.py
b/backend/server/rhnServer/server_hardware.py
index 8f33f8d..f23e2d6 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnServer/server_kickstart.py
b/backend/server/rhnServer/server_kickstart.py
index de02627..0e6c051 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/rhnServer/server_packages.py
b/backend/server/rhnServer/server_packages.py
index df591ce..6923c37 100644
--- a/backend/server/rhnServer/server_packages.py
+++ b/backend/server/rhnServer/server_packages.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
@@ -529,6 +528,3 @@ def _add_to_hash(hash, key, value):
hash[key] = { value : None }
else:
hash[key][value] = None
-
-if __name__ == '__main__':
- raise Exception("Not intended for standalone use")
diff --git a/backend/server/rhnServer/server_route.py
b/backend/server/rhnServer/server_route.py
index e65d9e4..7e559f6 100644
--- a/backend/server/rhnServer/server_route.py
+++ b/backend/server/rhnServer/server_route.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/server/rhnVirtualization.py b/backend/server/rhnVirtualization.py
index 6101a99..a1f0a40 100644
--- a/backend/server/rhnVirtualization.py
+++ b/backend/server/rhnVirtualization.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008--2010 Red Hat, Inc.
#
diff --git a/backend/server/taskomatic.py b/backend/server/taskomatic.py
index 662149e..eec676b 100644
--- a/backend/server/taskomatic.py
+++ b/backend/server/taskomatic.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
"""
Module for taskomatic related functions (inserting into queues, etc)
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ffb51d4..aff5607 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -618,11 +618,11 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(755,root,root) %{_bindir}/satpasswd
%attr(755,root,root) %{_bindir}/satwho
%attr(755,root,root) %{_bindir}/spacewalk-remove-channel*
+%attr(755,root,root) %{_bindir}/rhn-entitlement-report
%{rhnroot}/satellite_tools/SequenceServer.py*
%{rhnroot}/satellite_tools/messages.py*
%{rhnroot}/satellite_tools/progress_bar.py*
%{rhnroot}/satellite_tools/req_channels.py*
-%{rhnroot}/satellite_tools/rhn-entitlement-report.py*
%{rhnroot}/satellite_tools/satsync.py*
%{rhnroot}/satellite_tools/satCerts.py*
%{rhnroot}/satellite_tools/satComputePkgHeaders.py*
diff --git a/backend/upload_server/handlers/package_push/__init__.py
b/backend/upload_server/handlers/package_push/__init__.py
index 5b39d57..542b9c0 100644
--- a/backend/upload_server/handlers/package_push/__init__.py
+++ b/backend/upload_server/handlers/package_push/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/upload_server/handlers/package_push/package_push.py
b/backend/upload_server/handlers/package_push/package_push.py
index e3dac16..a48b618 100644
--- a/backend/upload_server/handlers/package_push/package_push.py
+++ b/backend/upload_server/handlers/package_push/package_push.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Code that drops files on the filesystem (/PKG-UPLOAD)
#
diff --git a/backend/upload_server/handlers/package_upload/__init__.py
b/backend/upload_server/handlers/package_upload/__init__.py
index 65aeb8b..8869ef4 100644
--- a/backend/upload_server/handlers/package_upload/__init__.py
+++ b/backend/upload_server/handlers/package_upload/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Copyright (c) 2008 Red Hat, Inc.
#
diff --git a/backend/upload_server/handlers/package_upload/package_upload.py
b/backend/upload_server/handlers/package_upload/package_upload.py
index be7dd5d..042fb65 100644
--- a/backend/upload_server/handlers/package_upload/package_upload.py
+++ b/backend/upload_server/handlers/package_upload/package_upload.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
#
# Code that drops files on the filesystem (/PKG-UPLOAD)
#
commit 378aa3086b21889643375a9f44b09d8aec7ea944
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 17:06:39 2010 +0200
fix spelling error
addressing rpmlint warnings:
spacewalk-backend-iss.noarch: W: spelling-error %description -l en_US mdoules ->
modules
spacewalk-backend-iss-export.noarch: W: spelling-error %description -l en_US mdoules
-> modules
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b88ae90..ffb51d4 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -152,7 +152,7 @@ Provides: rhns-sat = 1:%{version}-%{release}
%description iss
%{name} contains the basic code that provides server/backend
functionality for a variety of XML-RPC receivers. The architecture is
-modular so that you can plug/install additional mdoules for XML-RPC
+modular so that you can plug/install additional modules for XML-RPC
receivers and get them enabled automatically.
This package contains /SAT handler, which provide Inter Spacewalk Sync
@@ -167,7 +167,7 @@ Requires: %{name}-xml-export-libs = %{version}-%{release}
%description iss-export
%{name} contains the basic code that provides server/backend
functionality for a variety of XML-RPC receivers. The architecture is
-modular so that you can plug/install additional mdoules for XML-RPC
+modular so that you can plug/install additional modules for XML-RPC
receivers and get them enabled automatically.
This package contains listener for the Server XML dumper.
commit 3f6795624822dce990ec5eb50c86c03015aa9325
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 17:03:59 2010 +0200
add logrotate entry for reposync.log
diff --git a/backend/logrotate/spacewalk-backend-tools
b/backend/logrotate/spacewalk-backend-tools
index f9141cc..88e766a 100644
--- a/backend/logrotate/spacewalk-backend-tools
+++ b/backend/logrotate/spacewalk-backend-tools
@@ -11,3 +11,13 @@
missingok
size=10M
}
+
+/var/log/rhn/reposync/reposync.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
commit c4d32a1a43faad63c59b71e29926b4947910562e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:59:15 2010 +0200
fix not standard dir permisions
addressing rpmlint errors:
spacewalk-backend.noarch: E: non-standard-dir-perm /etc/rhn/default 0750L
spacewalk-backend-server.noarch: E: non-standard-dir-perm /var/cache/rhn 0750L
spacewalk-backend-tools.noarch: E: non-standard-dir-perm /var/log/rhn/reposync 0770L
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a92b0cb..b88ae90 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -351,7 +351,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/common/RPC_Base.py*
%dir %{_var}/log/rhn
# config files
-%attr(750,root,apache) %dir %{rhnconf}/default
+%attr(755,root,apache) %dir %{rhnconf}/default
%attr(644,root,apache) %{rhnconf}/default/rhn.conf
%attr(755,root,root) %{_bindir}/spacewalk-cfg-get
%{_mandir}/man8/spacewalk-cfg-get.8.gz
@@ -445,7 +445,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/repomd/view.py*
# the cache
-%attr(750,apache,apache) %dir %{_var}/cache/rhn
+%attr(755,apache,apache) %dir %{_var}/cache/rhn
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server.conf
# main httpd config
@@ -644,7 +644,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_tools/disk_dumper/dumper.py*
%{rhnroot}/satellite_tools/disk_dumper/string_buffer.py*
%dir %{rhnroot}/satellite_tools/repo_plugins
-%attr(770,root,apache) %dir %{_var}/log/rhn/reposync
+%attr(755,root,apache) %dir %{_var}/log/rhn/reposync
%{rhnroot}/satellite_tools/repo_plugins/__init__.py*
%{rhnroot}/satellite_tools/repo_plugins/yum_src.py*
%config %attr(644,root,apache) %{rhnconf}/default/rhn_server_iss.conf
commit 81f47360b5e7fc474dc991063a3de2f29215dcef
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:34:38 2010 +0200
fix Makefile - pack new renamed logrotate files
diff --git a/backend/logrotate/Makefile b/backend/logrotate/Makefile
index 584b482..f765866 100644
--- a/backend/logrotate/Makefile
+++ b/backend/logrotate/Makefile
@@ -5,7 +5,7 @@
# what is the backend top dir
TOP = ..
-INSTALL_FILES = $(wildcard rhn_*)
+INSTALL_FILES = $(wildcard spacewalk-backend-*)
INSTALL_DEST = /etc/logrotate.d
include $(TOP)/Makefile.defs
commit 4f3dd1d3041807a4ab564c6484a0999e5b2b7568
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:40:31 2010 +0200
rename logrotate/rhn_server_satellite to logrotate/spacewalk-backend-tools
addressing:
spacewalk-backend-tools.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server_satellite
diff --git a/backend/logrotate/rhn_server_satellite
b/backend/logrotate/rhn_server_satellite
deleted file mode 100644
index f9141cc..0000000
--- a/backend/logrotate/rhn_server_satellite
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_server_satellite.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-tools
b/backend/logrotate/spacewalk-backend-tools
new file mode 100644
index 0000000..f9141cc
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-tools
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_server_satellite.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8f813bc..a92b0cb 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -603,7 +603,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
%attr(644,root,apache) %{rhnconf}/default/rhn_server_satellite.conf
-%config %{_sysconfdir}/logrotate.d/rhn_server_satellite
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-tools
%attr(755,root,root) %{_bindir}/rhn-charsets
%attr(755,root,root) %{_bindir}/rhn-satellite-activate
%attr(755,root,root) %{_bindir}/rhn-schema-version
commit 533c29af133c4ceab8b5a42247cec7e334901cf8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:33:42 2010 +0200
rename logrotate/rhn_package_push to logrotate/spacewalk-backend-package-push-server
addressing rpmlint error:
spacewalk-backend-package-push-server: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_package_push
diff --git a/backend/logrotate/rhn_package_push b/backend/logrotate/rhn_package_push
deleted file mode 100644
index b2f09b1..0000000
--- a/backend/logrotate/rhn_package_push
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network package uploader
-#
-# $Id$
-
-/var/log/rhn/rhn_upload_package_push.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-package-push-server
b/backend/logrotate/spacewalk-backend-package-push-server
new file mode 100644
index 0000000..b2f09b1
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-package-push-server
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network package uploader
+#
+# $Id$
+
+/var/log/rhn/rhn_upload_package_push.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 08940b0..8f813bc 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -596,7 +596,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/upload_server/handlers/package_push
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
-%config %{_sysconfdir}/logrotate.d/rhn_package_push
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-package-push-server
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
%files tools
commit 6d35fbdde0f17b34288d2c291eabb6415a4648d7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:31:09 2010 +0200
rename logrotate/rhn_package_upload to logrotate/spacewalk-backend-upload-server
addressing rpmlint error:
spacewalk-backend-upload-server.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_package_upload
diff --git a/backend/logrotate/rhn_package_upload b/backend/logrotate/rhn_package_upload
deleted file mode 100644
index abbda9e..0000000
--- a/backend/logrotate/rhn_package_upload
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network package uploader
-#
-# $Id$
-
-/var/log/rhn/rhn_pkg_upload.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-upload-server
b/backend/logrotate/spacewalk-backend-upload-server
new file mode 100644
index 0000000..abbda9e
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-upload-server
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network package uploader
+#
+# $Id$
+
+/var/log/rhn/rhn_pkg_upload.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index db4c7e3..08940b0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -582,7 +582,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/upload_server/handlers/package
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package.conf
-%config %{_sysconfdir}/logrotate.d/rhn_package_upload
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-upload-server
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-pkg-upload.conf
%files package-push-server
commit c1e64e9143d7d995c80e04d588052914a0f6f4e7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:27:51 2010 +0200
rename logrotate/rhn_server to logrotate/spacewalk-backend-server
addressing rpmlint error:
spacewalk-backend-server.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server
diff --git a/backend/logrotate/rhn_server b/backend/logrotate/rhn_server
deleted file mode 100644
index 07a0019..0000000
--- a/backend/logrotate/rhn_server
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_server.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-server
b/backend/logrotate/spacewalk-backend-server
new file mode 100644
index 0000000..07a0019
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-server
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_server.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 93b1d31..db4c7e3 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -469,7 +469,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%endif
# logs and other stuff
-%config %{_sysconfdir}/logrotate.d/rhn_server
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-server
# translations
%{rhnroot}/locale
commit caf17f99246caa93b2f4f39b1aa282c31590579f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:25:42 2010 +0200
rename logrotate/rhn_sat_export_internal to logrotate/spacewalk-backend-iss-export
addressing rpmlint error:
spacewalk-backend-iss-export.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_sat_export_internal
diff --git a/backend/logrotate/rhn_sat_export_internal
b/backend/logrotate/rhn_sat_export_internal
deleted file mode 100644
index 852b436..0000000
--- a/backend/logrotate/rhn_sat_export_internal
+++ /dev/null
@@ -1,12 +0,0 @@
-# logrotation file for Red Hat Network package uploader
-#
-
-/var/log/rhn/rhn_sat_export_internal.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
-}
-
diff --git a/backend/logrotate/spacewalk-backend-iss-export
b/backend/logrotate/spacewalk-backend-iss-export
new file mode 100644
index 0000000..7d41f82
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-iss-export
@@ -0,0 +1,11 @@
+# logrotation file for Red Hat Network package uploader
+#
+
+/var/log/rhn/rhn_sat_export_internal.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ab57a34..93b1d31 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -537,7 +537,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_exporter/handlers/non_auth_dumper.py*
# config files
%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
-%config %{_sysconfdir}/logrotate.d/rhn_sat_export_internal
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-iss-export
%attr(644,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
commit 9f395d4ee047496fb88ef5286b4185647e13a9b6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:24:16 2010 +0200
rename logrotate/rhn_server_sat to logrotate/spacewalk-backend-iss
addressing rpmlint error:
spacewalk-backend-iss.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server_sat
diff --git a/backend/logrotate/rhn_server_sat b/backend/logrotate/rhn_server_sat
deleted file mode 100644
index 99f5ca6..0000000
--- a/backend/logrotate/rhn_server_sat
+++ /dev/null
@@ -1,12 +0,0 @@
-# logrotation file for Spacewalk Server - SAT handler
-#
-
-/var/log/rhn/rhn_server_sat.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-iss
b/backend/logrotate/spacewalk-backend-iss
new file mode 100644
index 0000000..99f5ca6
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-iss
@@ -0,0 +1,12 @@
+# logrotation file for Spacewalk Server - SAT handler
+#
+
+/var/log/rhn/rhn_server_sat.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4fb6d62..ab57a34 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -522,7 +522,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/sat
%{rhnroot}/server/handlers/sat/*
-%config %{_sysconfdir}/logrotate.d/rhn_server_sat
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-iss
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat.conf
%files iss-export
commit a78f02d0833c6345610973a9f2a2d61816a5f84b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:22:52 2010 +0200
rename logrotate/rhn_config_management_tool to
logrotate/spacewalk-backend-config-files-tool
addressing rpmlint error:
spacewalk-backend-config-files-tool.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_config_management_tool
diff --git a/backend/logrotate/rhn_config_management_tool
b/backend/logrotate/rhn_config_management_tool
deleted file mode 100644
index 050a98f..0000000
--- a/backend/logrotate/rhn_config_management_tool
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_config_management_tool.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-config-files-tool
b/backend/logrotate/spacewalk-backend-config-files-tool
new file mode 100644
index 0000000..050a98f
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-config-files-tool
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_config_management_tool.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ddef1e1..4fb6d62 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -569,7 +569,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/config_mgmt/*
%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
-%config %{_sysconfdir}/logrotate.d/rhn_config_management_tool
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files-tool
%files upload-server
%defattr(-,root,root)
commit af08c583e6c428b28ab1a63f4471d286aa475949
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:21:26 2010 +0200
rename logrotate/rhn_config_management to logrotate/spacewalk-backend-config-files
addressing rpmlint error:
spacewalk-backend-config-files.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_config_management
diff --git a/backend/logrotate/rhn_config_management
b/backend/logrotate/rhn_config_management
deleted file mode 100644
index e716920..0000000
--- a/backend/logrotate/rhn_config_management
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_config_management.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-config-files
b/backend/logrotate/spacewalk-backend-config-files
new file mode 100644
index 0000000..e716920
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-config-files
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_config_management.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index db0ab23..ddef1e1 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -560,7 +560,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/config/*
%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
-%config %{_sysconfdir}/logrotate.d/rhn_config_management
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
%files config-files-tool
%defattr(-,root,root)
commit f5ab132fba90a28f34ebd84d77130f05da105597
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:19:43 2010 +0200
rename logrotate/rhn_server_applet to logrotate/spacewalk-backend-applet
addressing rpmlint error:
spacewalk-backend-applet.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server_applet
diff --git a/backend/logrotate/rhn_server_applet b/backend/logrotate/rhn_server_applet
deleted file mode 100644
index babe610..0000000
--- a/backend/logrotate/rhn_server_applet
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_server_applet.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-applet
b/backend/logrotate/spacewalk-backend-applet
new file mode 100644
index 0000000..8514607
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-applet
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_server_applet.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ab04c7c..db0ab23 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -495,7 +495,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_applet.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
-%config %{_sysconfdir}/logrotate.d/rhn_server_applet
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-applet
%files app
%defattr(-,root,root)
commit 48fdb5085dac3f130c56709b756356391ecb2a73
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:17:50 2010 +0200
rename logrotate/rhn_server_app to logrotate/spacewalk-backend-app
addressing rpmlint error:
spacewalk-backend-app.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server_app
diff --git a/backend/logrotate/rhn_server_app b/backend/logrotate/rhn_server_app
deleted file mode 100644
index 797ed07..0000000
--- a/backend/logrotate/rhn_server_app
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_server_app.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-app
b/backend/logrotate/spacewalk-backend-app
new file mode 100644
index 0000000..797ed07
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-app
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_server_app.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index cd81742..ab04c7c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -505,7 +505,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_app.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
-%config %{_sysconfdir}/logrotate.d/rhn_server_app
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-app
%files xp
%defattr(-,root,root)
commit 6d66835f06be5cc036203cf4d057e2e4ca1e6202
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:12:11 2010 +0200
rename logrotate/rhn_server_xmlrpc to logrotate/spacewalk-backend-xmlrpc
addressing rpmlint error:
spacewalk-backend-xmlrpc.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server_xmlrpc
diff --git a/backend/logrotate/rhn_server_xmlrpc b/backend/logrotate/rhn_server_xmlrpc
deleted file mode 100644
index 7b4b2fe..0000000
--- a/backend/logrotate/rhn_server_xmlrpc
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_server_xmlrpc.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-xmlrpc
b/backend/logrotate/spacewalk-backend-xmlrpc
new file mode 100644
index 0000000..5259410
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-xmlrpc
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_server_xmlrpc.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 937f15d..cd81742 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -485,7 +485,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_xmlrpc.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
-%config %{_sysconfdir}/logrotate.d/rhn_server_xmlrpc
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-xmlrpc
%files applet
%defattr(-,root,root)
commit 134f3b7b9d2f43444f50dbea6e54bbc1c39e145d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 16:10:35 2010 +0200
rename ./logrotate/rhn_server_xp to logrotate/spacewalk-backend-xp
addressing rpmlint error:
spacewalk-backend-xp.noarch: E: incoherent-logrotate-file
/etc/logrotate.d/rhn_server_xp
diff --git a/backend/logrotate/rhn_server_xp b/backend/logrotate/rhn_server_xp
deleted file mode 100644
index 255f473..0000000
--- a/backend/logrotate/rhn_server_xp
+++ /dev/null
@@ -1,13 +0,0 @@
-# logrotation file for Red Hat Network Server
-#
-# $Id$
-
-/var/log/rhn/rhn_server_xp.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
- size=10M
-}
diff --git a/backend/logrotate/spacewalk-backend-xp
b/backend/logrotate/spacewalk-backend-xp
new file mode 100644
index 0000000..255f473
--- /dev/null
+++ b/backend/logrotate/spacewalk-backend-xp
@@ -0,0 +1,13 @@
+# logrotation file for Red Hat Network Server
+#
+# $Id$
+
+/var/log/rhn/rhn_server_xp.log {
+ weekly
+ rotate 5
+ copytruncate
+ compress
+ notifempty
+ missingok
+ size=10M
+}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index cfbb812..937f15d 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -515,7 +515,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_xp.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xp.conf
-%config %{_sysconfdir}/logrotate.d/rhn_server_xp
+%config %{_sysconfdir}/logrotate.d/spacewalk-backend-xp
%files iss
%defattr(-,root,root)
commit cb39d0a0ff1e5b1b92465f84a6a29a3689ed2be6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 15:55:12 2010 +0200
set default config files readable by all users
there is nothing secure in those files, nothing to hide
all secret keys etc. are in /etc/rhn/rhn.conf
addressing rpmlint errors:
spacewalk-backend.noarch: E: non-readable /etc/rhn/default/rhn.conf 0640L
spacewalk-backend-app.noarch: E: non-readable /etc/rhn/default/rhn_server_app.conf
0640L
spacewalk-backend-app.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-app.conf 0640L
spacewalk-backend-applet.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-applet.conf 0640L
spacewalk-backend-applet.noarch: E: non-readable
/etc/rhn/default/rhn_server_applet.conf 0640L
spacewalk-backend-config-files.noarch: E: non-readable
/etc/rhn/default/rhn_server_config-management.conf 0640L
spacewalk-backend-config-files.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-config-management.conf 0640L
spacewalk-backend-config-files-tool.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-config-management-tool.conf 0640L
spacewalk-backend-config-files-tool.noarch: E: non-readable
/etc/rhn/default/rhn_server_config-management-tool.conf 0640L
spacewalk-backend-iss.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-sat.conf 0640L
spacewalk-backend-iss-export.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-sat-export-internal.conf 0640L
spacewalk-backend-iss-export.noarch: E: non-readable
/etc/rhn/default/rhn_server_satexport_internal.conf 0640L
spacewalk-backend-package-push-server.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-package-push.conf 0640L
spacewalk-backend-package-push-server.noarch: E: non-readable
/etc/rhn/default/rhn_server_upload_package-push.conf 0640L
spacewalk-backend-package-push-server.noarch: E: non-readable
/etc/rhn/default/rhn_server_upload.conf 0640L
spacewalk-backend-server.noarch: E: non-readable
/etc/httpd/conf.d/zz-spacewalk-server-wsgi.conf 0640L
spacewalk-backend-server.noarch: E: non-readable /etc/rhn/default/rhn_server.conf
0640L
spacewalk-backend-server.noarch: E: non-readable
/etc/httpd/conf.d/zz-spacewalk-server.conf 0640L
spacewalk-backend-tools.noarch: E: non-readable /usr/bin/spacewalk-remove-channel
0750L
spacewalk-backend-tools.noarch: E: non-readable /usr/bin/satwho 0750L
spacewalk-backend-tools.noarch: E: non-readable
/etc/rhn/default/rhn_server_satellite.conf 0640L
spacewalk-backend-tools.noarch: E: non-readable /usr/bin/satpasswd 0750L
spacewalk-backend-xmlrpc.noarch: E: non-readable
/etc/rhn/default/rhn_server_xmlrpc.conf 0640L
spacewalk-backend-xmlrpc.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-xmlrpc.conf 0640L
spacewalk-backend-xp.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-xp.conf 0640L
spacewalk-backend-xp.noarch: E: non-readable /etc/rhn/default/rhn_server_xp.conf
0640L
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6bad634..cfbb812 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -352,7 +352,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{_var}/log/rhn
# config files
%attr(750,root,apache) %dir %{rhnconf}/default
-%attr(640,root,apache) %{rhnconf}/default/rhn.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn.conf
%attr(755,root,root) %{_bindir}/spacewalk-cfg-get
%{_mandir}/man8/spacewalk-cfg-get.8.gz
# wsgi stuff
@@ -447,15 +447,15 @@ rm -f %{rhnconf}/rhnSecret.py*
# the cache
%attr(750,apache,apache) %dir %{_var}/cache/rhn
# config files
-%attr(640,root,apache) %{rhnconf}/default/rhn_server.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server.conf
# main httpd config
-%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server.conf
+%attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server.conf
%if 0%{?rhel} && 0%{?rhel} < 6
-%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-python.conf
+%attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server-python.conf
%else
# wsgi stuff
-%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-wsgi.conf
+%attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server-wsgi.conf
%{rhnroot}/wsgi/app.py*
%{rhnroot}/wsgi/applet.py*
%{rhnroot}/wsgi/config.py*
@@ -483,8 +483,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/action_extra_data
%{rhnroot}/server/action_extra_data/*
# config files
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_xmlrpc.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_xmlrpc.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_xmlrpc
%files applet
@@ -493,8 +493,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/applet
%{rhnroot}/server/handlers/applet/*
# config files
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_applet.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_applet.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_applet
%files app
@@ -503,8 +503,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/app
%{rhnroot}/server/handlers/app/*
# config files
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_app.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_app.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_app
%files xp
@@ -513,8 +513,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/xp
%{rhnroot}/server/handlers/xp/*
# config files
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_xp.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xp.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_xp.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xp.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_xp
%files iss
@@ -523,7 +523,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/sat
%{rhnroot}/server/handlers/sat/*
%config %{_sysconfdir}/logrotate.d/rhn_server_sat
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat.conf
%files iss-export
%defattr(-,root,root)
@@ -536,9 +536,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_exporter/handlers/__init__.py*
%{rhnroot}/satellite_exporter/handlers/non_auth_dumper.py*
# config files
-%attr(640,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
+%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
%config %{_sysconfdir}/logrotate.d/rhn_sat_export_internal
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
%files libs
@@ -558,8 +558,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config
%{rhnroot}/server/handlers/config/*
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
%config %{_sysconfdir}/logrotate.d/rhn_config_management
%files config-files-tool
@@ -567,8 +567,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config_mgmt
%{rhnroot}/server/handlers/config_mgmt/*
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
-%attr(640,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
+%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
%config %{_sysconfdir}/logrotate.d/rhn_config_management_tool
%files upload-server
@@ -594,15 +594,15 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/upload_server/handlers
%{rhnroot}/upload_server/handlers/__init__.py*
%{rhnroot}/upload_server/handlers/package_push
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload.conf
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
%config %{_sysconfdir}/logrotate.d/rhn_package_push
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
%files tools
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_satellite.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_satellite.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_satellite
%attr(755,root,root) %{_bindir}/rhn-charsets
%attr(755,root,root) %{_bindir}/rhn-satellite-activate
@@ -615,9 +615,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(755,root,root) %{_bindir}/spacewalk-repo-sync
%attr(755,root,root) %{_bindir}/rhn-db-stats
%attr(755,root,root) %{_bindir}/rhn-schema-stats
-%attr(750,root,root) %{_bindir}/satpasswd
-%attr(750,root,root) %{_bindir}/satwho
-%attr(750,root,root) %{_bindir}/spacewalk-remove-channel*
+%attr(755,root,root) %{_bindir}/satpasswd
+%attr(755,root,root) %{_bindir}/satwho
+%attr(755,root,root) %{_bindir}/spacewalk-remove-channel*
%{rhnroot}/satellite_tools/SequenceServer.py*
%{rhnroot}/satellite_tools/messages.py*
%{rhnroot}/satellite_tools/progress_bar.py*
commit 7d48d4d7ab096551c7a53c7670c76ec83c441303
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 15:34:56 2010 +0200
add to license PYTHON since we use compile.py
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b4d3165..6bad634 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,8 +7,13 @@
Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
+<<<<<<< HEAD
License: GPLv2
Version: 1.1.27
+=======
+License: GPLv2 and Python
+Version: 1.1.26
+>>>>>>> add to license PYTHON since we use compile.py
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
commit bcae168c3155a2f54831509e18c54821db90d0ef
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 15:07:57 2010 +0200
add licensing files to %doc
addresing rpmlint warnings:
spacewalk-backend-app.noarch: W: no-documentation
spacewalk-backend-applet.noarch: W: no-documentation
spacewalk-backend-config-files.noarch: W: no-documentation
spacewalk-backend-config-files-common.noarch: W: no-documentation
spacewalk-backend-config-files-tool.noarch: W: no-documentation
spacewalk-backend-iss.noarch: W: no-documentation
spacewalk-backend-iss-export.noarch: W: no-documentation
spacewalk-backend-libs.noarch: W: no-documentation
spacewalk-backend-package-push-server.noarch: W: no-documentation
spacewalk-backend-server.noarch: W: no-documentation
spacewalk-backend-sql.noarch: W: no-documentation
spacewalk-backend-sql-oracle.noarch: W: no-documentation
spacewalk-backend-sql-postgresql.noarch: W: no-documentation
spacewalk-backend-upload-server.noarch: W: no-documentation
spacewalk-backend-xml-export-libs.noarch: W: no-documentation
spacewalk-backend-xmlrpc.noarch: W: no-documentation
spacewalk-backend-xp.noarch: W: no-documentation
diff --git a/backend/LICENSE b/backend/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/backend/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ba85346..b4d3165 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -323,6 +323,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}
%dir %{rhnroot}/common
%{rhnroot}/common/__init__.py*
@@ -359,6 +360,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files sql
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
# Need __init__ = share it with rhns-server
%dir %{rhnroot}/server
%{rhnroot}/server/__init__.py*
@@ -370,14 +372,17 @@ rm -f %{rhnconf}/rhnSecret.py*
%files sql-oracle
%defattr(-,root,root,-)
+%doc PYTHON-LICENSES.txt LICENSE
%{rhnroot}/server/rhnSQL/driver_cx_Oracle.py*
%files sql-postgresql
+%doc PYTHON-LICENSES.txt LICENSE
%defattr(-,root,root,-)
%{rhnroot}/server/rhnSQL/driver_postgresql.py*
%files server
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
# modules
%{rhnroot}/server/apacheAuth.py*
%{rhnroot}/server/apacheHandler.py*
@@ -465,6 +470,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files xmlrpc
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/xmlrpc
%{rhnroot}/server/handlers/xmlrpc/*
%dir %{rhnroot}/server/action
@@ -477,7 +483,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%config %{_sysconfdir}/logrotate.d/rhn_server_xmlrpc
%files applet
-%defattr(-,root,root)
+%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/applet
%{rhnroot}/server/handlers/applet/*
# config files
@@ -486,7 +493,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%config %{_sysconfdir}/logrotate.d/rhn_server_applet
%files app
-%defattr(-,root,root)
+%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/app
%{rhnroot}/server/handlers/app/*
# config files
@@ -495,7 +503,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%config %{_sysconfdir}/logrotate.d/rhn_server_app
%files xp
-%defattr(-,root,root)
+%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/xp
%{rhnroot}/server/handlers/xp/*
# config files
@@ -505,6 +514,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files iss
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/sat
%{rhnroot}/server/handlers/sat/*
%config %{_sysconfdir}/logrotate.d/rhn_server_sat
@@ -512,7 +522,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files iss-export
%defattr(-,root,root)
-
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/satellite_exporter
%{rhnroot}/satellite_exporter/__init__.py*
%{rhnroot}/satellite_exporter/satexport.py*
@@ -528,16 +538,19 @@ rm -f %{rhnconf}/rhnSecret.py*
%files libs
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%{python_sitelib}/spacewalk*
%files config-files-common
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%{rhnroot}/server/configFilesHandler.py*
%dir %{rhnroot}/server/config_common
%{rhnroot}/server/config_common/*
%files config-files
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config
%{rhnroot}/server/handlers/config/*
%attr(640,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
@@ -546,6 +559,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files config-files-tool
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config_mgmt
%{rhnroot}/server/handlers/config_mgmt/*
%attr(640,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
@@ -554,6 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files upload-server
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
# Some directories and files are shared with rhns-package-push-server
%dir %{rhnroot}/upload_server
%{rhnroot}/upload_server/__init__.py*
@@ -567,6 +582,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files package-push-server
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
# Some directories and files are shared with rhns-upload-server
%dir %{rhnroot}/upload_server
%{rhnroot}/upload_server/__init__.py*
@@ -580,6 +596,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files tools
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%attr(640,root,apache) %{rhnconf}/default/rhn_server_satellite.conf
%config %{_sysconfdir}/logrotate.d/rhn_server_satellite
%attr(755,root,root) %{_bindir}/rhn-charsets
@@ -641,6 +658,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files xml-export-libs
%defattr(-,root,root)
+%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/satellite_tools
%{rhnroot}/satellite_tools/__init__.py*
%{rhnroot}/satellite_tools/geniso.py*
commit b3dfd52dff600770a01791e3cd09783f92f7ccc9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 15:00:04 2010 +0200
spelling error
addressing rpmlint warning:
spacewalk-backend-iss.noarch: W: spelling-error %description -l en_US mdoules ->
modules
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9b6b614..ba85346 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -83,7 +83,7 @@ Requires: mod_wsgi
%description server
This package contains the basic code that provides server/backend
functionality for a variety of XML-RPC receivers. The architecture is
-modular so that you can plug/install additional mdoules for XML-RPC
+modular so that you can plug/install additional modules for XML-RPC
receivers and get them enabled automatically.
%package xmlrpc
commit a1f072ea2647311286a96d7e5fb33089c7808d1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 14:53:07 2010 +0200
make config files readable
addressing rpmlint warnings:
spacewalk-backend-package-push-server.noarch: E: non-readable
/etc/rhn/default/rhn_server_upload.conf 0640L
spacewalk-backend-package-push-server.noarch: E: non-readable
/etc/rhn/default/rhn_server_upload_package-push.conf 0640L
spacewalk-backend-package-push-server.noarch: E: non-readable
/etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-package-push.conf 0640L
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9c21c30..9b6b614 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -560,10 +560,10 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/upload_server/handlers
%{rhnroot}/upload_server/handlers/__init__.py*
%{rhnroot}/upload_server/handlers/package
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload.conf
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_upload_package.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
+%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package.conf
%config %{_sysconfdir}/logrotate.d/rhn_package_upload
-%attr(640,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-pkg-upload.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-pkg-upload.conf
%files package-push-server
%defattr(-,root,root)
commit 324a4f18e9c05827cf822fa1347041cf76c45291
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 7 14:47:40 2010 +0200
453457 - extract from package spacewalk-backend-sql new packages
spacewalk-backend-sql-oracle and spacewalk-backend-sql-postgresql
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7799785..9c21c30 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -40,14 +40,31 @@ This package includes the common code required by all
servers/proxies.
Summary: Core functions providing SQL connectivity for the RHN backend modules
Group: Applications/Internet
Requires(pre): %{name} = %{version}-%{release}
-Requires: python(:DBAPI:oracle)
Obsoletes: rhns-sql < 5.3.0
Provides: rhns-sql = 1:%{version}-%{release}
+Requires: %{name}-sql-oracle = %{version}-%{release}
+Requires: %{name}-sql-postgresql = %{version}-%{release}
%description sql
This package contains the basic code that provides SQL connectivity for the Spacewalk
backend modules.
+%package sql-oracle
+Summary: Oracle backend for Spacewalk
+Group: Applications/Internet
+Requires: python(:DBAPI:oracle)
+
+%description sql-oracle
+This package contains provides Oracle connectivity for the Spacewalk backend modules.
+
+%package sql-postgresql
+Summary: Postgresql backend for Spacewalk
+Group: Applications/Internet
+Requires: python-pgsql
+
+%description sql-postgresql
+This package contains provides PostgreSQL connectivity for the Spacewalk backend
modules.
+
%package server
Summary: Basic code that provides RHN Server functionality
Group: Applications/Internet
@@ -346,7 +363,18 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server
%{rhnroot}/server/__init__.py*
%dir %{rhnroot}/server/rhnSQL
-%{rhnroot}/server/rhnSQL/*
+%{rhnroot}/server/rhnSQL/const.py*
+%{rhnroot}/server/rhnSQL/dbi.py*
+%{rhnroot}/server/rhnSQL/__init__.py*
+%{rhnroot}/server/rhnSQL/sql_*.py*
+
+%files sql-oracle
+%defattr(-,root,root,-)
+%{rhnroot}/server/rhnSQL/driver_cx_Oracle.py*
+
+%files sql-postgresql
+%defattr(-,root,root,-)
+%{rhnroot}/server/rhnSQL/driver_postgresql.py*
%files server
%defattr(-,root,root)