3 commits - backend/Makefile.backend backend/apache-conf backend/httpd-conf backend/spacewalk-backend.spec proxy/proxy

[Michael Mraka]

 backend/Makefile.backend                                             |    2 
 backend/apache-conf/zz-spacewalk-server-python.conf                  |   15 -
 backend/httpd-conf/Makefile                                          |   13 -
 backend/httpd-conf/rhn/spacewalk-backend-app.conf                    |   23 --
 backend/httpd-conf/rhn/spacewalk-backend-applet.conf                 |   24 --
 backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf |   24 --
 backend/httpd-conf/rhn/spacewalk-backend-config-management.conf      |   24 --
 backend/httpd-conf/rhn/spacewalk-backend-package-push.conf           |   26 ---
 backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf      |   18 --
 backend/httpd-conf/rhn/spacewalk-backend-sat.conf                    |   24 --
 backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf                 |   24 --
 backend/spacewalk-backend.spec                                       |   11 -
 proxy/proxy/httpd-conf/spacewalk-proxy-python.conf                   |   86 ----------
 proxy/proxy/spacewalk-proxy.spec                                     |   19 --
 14 files changed, 1 insertion(+), 332 deletions(-)

New commits:
commit 34c3e9c2c0177345a8f0c0ce2a2a9757e136ec67
Author: Michael Mraka <michael.mraka(a)redhat.com&gt;
Date:   Fri Aug 30 09:51:57 2013 +0200

    1002007 - use mod_wsgi even on RHEL5

diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-python.conf
b/proxy/proxy/httpd-conf/spacewalk-proxy-python.conf
deleted file mode 100644
index 884cbe4..0000000
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-python.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Spacewalk proxy
-#
-
-<LocationMatch "^/*">
-    # this stanza contains all the handlers for RHN app code
-
-    # added for oracle
-    SetEnv NLS_LANG english.UTF8
-
-    # mod_python
-    <IfModule !mod_python.c>
-    LoadModule python_module modules/mod_python.so
-    AddModule mod_python.c
-    </IfModule>
-
-    PythonPath "sys.path+['/usr/share/rhn']"
-    PythonDebug Off
-
-    SetHandler python-program
-    # all of these handlers are defined in apacheServer
-    PythonHeaderParserHandler     proxy.apacheServer::HeaderParserHandler
-    PythonHandler                 proxy.apacheServer::Handler
-    PythonCleanupHandler          proxy.apacheServer::CleanupHandler
-    DefaultType text/xml
-
-    DirectoryIndex _rhn_proxy/index.html index.html index.htm index.html.var index.shtml
index.php index.php4 index.php3 index.phtml index.cgi
-
-</LocationMatch>
-
-#
-# Spacewalk proxy broker
-#
-
-<Location /XMLRPC>
-    SetHandler python-program
-    # all of these handlers are defined in apacheServer
-    PythonHeaderParserHandler     proxy.apacheServer::HeaderParserHandler
-    PythonHandler                 proxy.apacheServer::Handler
-    PythonCleanupHandler          proxy.apacheServer::CleanupHandler
-    PythonOption RHNComponentType proxy.broker
-    DefaultType text/xml
-    # Uncomment (and edit) the following to limit access to this proxy's
-    # services
-    #<Limit GET POST>
-    #    Order allow,deny
-    #    Allow from goodguys.com
-    #</Limit>
-</Location>
-
-#
-# Spacewalk proxy SSL redirect
-#
-
-<Location /XMLRPC_SSL>
-    SetHandler python-program
-    # all of these handlers are defined in apacheServer
-    PythonHeaderParserHandler     proxy.apacheServer::HeaderParserHandler
-    PythonHandler                 proxy.apacheServer::Handler
-    PythonCleanupHandler          proxy.apacheServer::CleanupHandler
-    PythonOption RHNComponentType proxy.redirect
-    DefaultType text/xml
-    # Uncomment (and edit) the following to limit access to this proxy's
-    # services
-    #<Limit GET POST>
-    #    Order allow,deny
-    #    Allow from goodguys.com
-    #</Limit>
-</Location>
-
-<Location /XMLRPC_REDIRECT>
-    SetHandler python-program
-    # all of these handlers are defined in apacheServer
-    PythonHeaderParserHandler     proxy.apacheServer::HeaderParserHandler
-    PythonHandler                 proxy.apacheServer::Handler
-    PythonCleanupHandler          proxy.apacheServer::CleanupHandler
-    PythonOption RHNComponentType proxy.redirect
-    DefaultType text/xml
-    # Uncomment (and edit) the following to limit access to this proxy's
-    # services
-    #<Limit GET POST>
-    #    Order allow,deny
-    #    Allow from goodguys.com
-    #</Limit>
-</Location>
-
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index d204031..ebc0654 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -73,11 +73,7 @@ Requires: spacewalk-proxy-package-manager
 Requires: spacewalk-ssl-cert-check
 Requires: httpd
 Requires: mod_ssl
-%if  0%{?rhel} && 0%{?rhel} < 6
-Requires: mod_python
-%else
 Requires: mod_wsgi
-%endif
 Requires(post): %{name}-common
 Conflicts: %{name}-redirect < %{version}-%{release}
 Conflicts: %{name}-redirect > %{version}-%{release}
@@ -117,11 +113,7 @@ between an Spacewalk Proxy Server and parent Spacewalk server.
 Group:   Applications/Internet
 Summary: Modules shared by Spacewalk Proxy components
 Requires: mod_ssl
-%if  0%{?rhel} && 0%{?rhel} < 6
-Requires: mod_python
-%else
 Requires: mod_wsgi
-%endif
 Requires: %{name}-broker >= %{version}
 Requires: spacewalk-backend >= 1.7.24
 Requires: policycoreutils
@@ -173,13 +165,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/rhn-proxy/list
 
 touch $RPM_BUILD_ROOT/%{httpdconf}/cobbler-proxy.conf
 
-%if  0%{?rhel} && 0%{?rhel} < 6
-rm -fv $RPM_BUILD_ROOT%{httpdconf}/spacewalk-proxy-wsgi.conf
-rm -rfv $RPM_BUILD_ROOT%{rhnroot}/wsgi/
-%else
-rm -fv $RPM_BUILD_ROOT%{httpdconf}/spacewalk-proxy-python.conf
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -302,13 +287,9 @@ fi
 %attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy.conf
 # this file is created by either cli or webui installer
 %ghost %config %{httpdconf}/cobbler-proxy.conf
-%if  0%{?rhel} && 0%{?rhel} < 6
-%attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy-python.conf
-%else
 %attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy-wsgi.conf
 %{rhnroot}/wsgi/xmlrpc.py*
 %{rhnroot}/wsgi/xmlrpc_redirect.py*
-%endif
 # the cache
 %attr(750,apache,root) %dir %{_var}/cache/rhn
 %attr(750,apache,root) %dir %{_var}/cache/rhn/proxy-auth


commit 786dc26ea98509e19bd7b89ea4d0e9e8872a1dcf
Author: Michael Mraka <michael.mraka(a)redhat.com&gt;
Date:   Thu Aug 29 12:02:43 2013 +0200

    don't install / build mod_python stuff

diff --git a/backend/Makefile.backend b/backend/Makefile.backend
index 9312281..9703e2b 100644
--- a/backend/Makefile.backend
+++ b/backend/Makefile.backend
@@ -4,7 +4,7 @@
 
 SPACEWALK_FILES = __init__
 CODE_DIRS = common server upload_server satellite_tools satellite_exporter po wsgi
-CONF_DIRS = apache-conf httpd-conf rhn-conf logrotate
+CONF_DIRS = apache-conf rhn-conf logrotate
 
 # We look for config files in "well known" locations (rhn-conf,
 # httpd-conf, logrotate)
diff --git a/backend/httpd-conf/Makefile b/backend/httpd-conf/Makefile
deleted file mode 100644
index d557239..0000000
--- a/backend/httpd-conf/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for installation of the httpd configuration files
-#
-# $Id$
-
-# what is the backend top dir
-TOP	= ..
-
-INSTALL_FILES	= $(wildcard *.conf) $(wildcard rhn/*.conf)
-INSTALL_DEST	= /etc/rhn/satellite-httpd/conf
-
-EXTRA_DIRS	= $(INSTALL_DEST)/rhn
-
-include $(TOP)/Makefile.defs


commit a051fcff3db8ce13b2059ffc025a19be16c56e8d
Author: Michael Mraka <michael.mraka(a)redhat.com&gt;
Date:   Thu Aug 29 11:59:36 2013 +0200

    removed unused mod_python stuff

diff --git a/backend/apache-conf/zz-spacewalk-server-python.conf
b/backend/apache-conf/zz-spacewalk-server-python.conf
deleted file mode 100644
index 80f9816..0000000
--- a/backend/apache-conf/zz-spacewalk-server-python.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<IfModule !mod_python.c>
-LoadModule python_module modules/mod_python.so
-AddModule mod_python.c
-</IfModule>
-
-PythonDebug Off
-
-
-# Name the default python subiterpreter
-PythonInterpreter rhn.server
-
-# We have to use wildcard here becuse some config files are optional
-Include /etc/rhn/satellite-httpd/conf/rhn/spacewalk-backend-*.conf
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-app.conf
b/backend/httpd-conf/rhn/spacewalk-backend-app.conf
deleted file mode 100644
index d384503..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-app.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /APP handler
-#
-
-<IfModule mod_python.c>
-
-<Location /APP>
-  SetHandler python-program
-  # all of these handlers are defined in apacheServer
-  PythonHeaderParserHandler 	spacewalk.server.apacheServer::HeaderParserHandler
-  PythonHandler 		spacewalk.server.apacheServer::Handler
-  PythonLogHandler 		spacewalk.server.apacheServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheServer::CleanupHandler
-  PythonOption SERVER app
-  PythonOption RHNComponentType server.app
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-applet.conf
b/backend/httpd-conf/rhn/spacewalk-backend-applet.conf
deleted file mode 100644
index 24e4e76..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-applet.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /APPLET receiver
-#
-
-<IfModule mod_python.c>
-
-<Location /APPLET>
-  SetHandler python-program
-  # all of these handlers are defined in apacheServer
-  PythonHeaderParserHandler 	spacewalk.server.apacheServer::HeaderParserHandler
-  PythonHandler 		spacewalk.server.apacheServer::Handler
-  PythonLogHandler 		spacewalk.server.apacheServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheServer::CleanupHandler
-  PythonOption SERVER applet
-  PythonOption RHNComponentType server.applet
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf
b/backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf
deleted file mode 100644
index 91ea698..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-config-management-tool.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /CONFIG-MANAGEMENT-TOOL handler
-#
-
-<IfModule mod_python.c>
-
-<Location /CONFIG-MANAGEMENT-TOOL>
-  SetHandler python-program
-  # all of these handlers are defined in apacheServer
-  PythonHeaderParserHandler 	spacewalk.server.apacheServer::HeaderParserHandler
-  PythonHandler 		spacewalk.server.apacheServer::Handler
-  PythonLogHandler 		spacewalk.server.apacheServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheServer::CleanupHandler
-  PythonOption SERVER config_mgmt
-  PythonOption RHNComponentType server.config-management-tool
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-config-management.conf
b/backend/httpd-conf/rhn/spacewalk-backend-config-management.conf
deleted file mode 100644
index 9a467cb..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-config-management.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /CONFIG-MANAGEMENT handler
-#
-
-<IfModule mod_python.c>
-
-<Location /CONFIG-MANAGEMENT>
-  SetHandler python-program
-  # all of these handlers are defined in apacheServer
-  PythonHeaderParserHandler 	spacewalk.server.apacheServer::HeaderParserHandler
-  PythonHandler 		spacewalk.server.apacheServer::Handler
-  PythonLogHandler 		spacewalk.server.apacheServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheServer::CleanupHandler
-  PythonOption SERVER config
-  PythonOption RHNComponentType server.config-management
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-package-push.conf
b/backend/httpd-conf/rhn/spacewalk-backend-package-push.conf
deleted file mode 100644
index 791189d..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-package-push.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /PACKAGE-PUSH handler
-#
-
-<IfModule mod_python.c>
-
-<Location /PACKAGE-PUSH>
-  SetHandler python-program
-  PythonHeaderParserHandler 	spacewalk.server.apacheUploadServer::HeaderParserHandler
-  PythonHandler 		spacewalk.server.apacheUploadServer::Handler
-  PythonLogHandler 		spacewalk.server.apacheUploadServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheUploadServer::CleanupHandler
-  PythonOption RHNComponentType server.upload.package-push
-  PythonOption SERVER package_push
-  # We need a new interpreter than the main one, since we don't want to have
-  # the requests mishandled
-  PythonInterpreter             rhn.server.upload
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
b/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
deleted file mode 100644
index 08a2e33..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /SAT-DUMP-INTERNAL handler
-#
-#
-
-<IfModule mod_python.c>
-
-<Location /SAT-DUMP-INTERNAL>
-  SetHandler python-program
-  PythonHeaderParserHandler    
spacewalk.satellite_exporter.satexport::HeaderParserHandler
-  PythonHandler                 spacewalk.satellite_exporter.satexport::Handler
-  PythonCleanupHandler          spacewalk.satellite_exporter.satexport::CleanupHandler
-  PythonOption SERVER non_auth_dumper
-  PythonOption RHNComponentType server.iss
-  DefaultType text/xml
-</Location>
-
-</IfModule>
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat.conf
b/backend/httpd-conf/rhn/spacewalk-backend-sat.conf
deleted file mode 100644
index 98d3d40..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-sat.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /SAT handler
-#
-
-<IfModule mod_python.c>
-
-<Location /SAT>
-  SetHandler python-program
-  # all of these handlers are defined in apacheServer
-  PythonHeaderParserHandler spacewalk.server.apacheServer::HeaderParserHandler
-  PythonHandler 			spacewalk.server.apacheServer::Handler
-  PythonLogHandler 			spacewalk.server.apacheServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheServer::CleanupHandler
-  PythonOption 	SERVER sat
-  PythonOption RHNComponentType server.iss
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf
b/backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf
deleted file mode 100644
index e7b0e28..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-xmlrpc.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /XMLRPC receiver
-#
-
-<IfModule mod_python.c>
-
-<Location /XMLRPC>
-  SetHandler python-program
-  # all of these handlers are defined in apacheServer
-  PythonHeaderParserHandler 	spacewalk.server.apacheServer::HeaderParserHandler
-  PythonHandler 		spacewalk.server.apacheServer::Handler
-  PythonLogHandler 		spacewalk.server.apacheServer::LogHandler
-  PythonCleanupHandler 		spacewalk.server.apacheServer::CleanupHandler
-  PythonOption SERVER xmlrpc
-  PythonOption RHNComponentType server.xmlrpc
-  DefaultType text/xml
-  ErrorDocument 403 "Error 403"
-  ErrorDocument 404 "Error 404"
-  ErrorDocument 500 "Error 500"
-</Location>
-
-</IfModule>
-
-
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 52e2cec..cca1494 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -1,7 +1,6 @@
 %global rhnroot %{_prefix}/share/rhn
 %global rhnconfigdefaults %{rhnroot}/config-defaults
 %global rhnconf %{_sysconfdir}/rhn
-%global httpdconf %{rhnconf}/satellite-httpd/conf
 %global apacheconfd %{_sysconfdir}/httpd/conf.d
 %if 0%{?rhel} && 0%{?rhel} < 6
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -278,8 +277,6 @@ make -f Makefile.backend install PREFIX=$RPM_BUILD_ROOT \
 export PYTHON_MODULE_NAME=%{name}
 export PYTHON_MODULE_VERSION=%{version}
 
-rm -v $RPM_BUILD_ROOT%{apacheconfd}/zz-spacewalk-server-python.conf
-
 %find_lang %{name}-server
 
 %clean
@@ -464,7 +461,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %{pythonrhnroot}/server/action_extra_data/*
 # config files
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_xmlrpc.conf
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-xmlrpc
 
 %files applet
@@ -473,7 +469,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %{rhnroot}/server/handlers/applet/*
 # config files
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_applet.conf
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-applet
 
 %files app
@@ -482,7 +477,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %{rhnroot}/server/handlers/app/*
 # config files
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_app.conf
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-app
 
 %files iss
@@ -490,7 +484,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %dir %{rhnroot}/server/handlers/sat
 %{rhnroot}/server/handlers/sat/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat.conf
 
 %files iss-export
 %doc LICENSE
@@ -504,7 +497,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %{rhnroot}/satellite_exporter/handlers/__init__.py*
 %{rhnroot}/satellite_exporter/handlers/non_auth_dumper.py*
 # config files
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat-dump-internal.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss-export
 
 
@@ -532,7 +524,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %dir %{rhnroot}/server/handlers/config
 %{rhnroot}/server/handlers/config/*
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management.conf
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
 
 %files config-files-tool
@@ -540,7 +531,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %dir %{rhnroot}/server/handlers/config_mgmt
 %{rhnroot}/server/handlers/config_mgmt/*
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management-tool.conf
-%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files-tool
 
 %files package-push-server
@@ -553,7 +543,6 @@ rm -f %{rhnconf}/rhnSecret.py*
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_upload.conf
 %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_upload_package-push.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-package-push-server
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
 
 %files tools
 %doc LICENSE