web/html/applications/rhn-proxy/4.0/httpd/httpd.conf | 5 +++--
web/html/applications/rhn-proxy/4.1/httpd/httpd.conf | 5 +++--
web/html/applications/rhn-proxy/4.2/httpd/httpd.conf | 5 +++--
web/html/applications/rhn-proxy/5.0/httpd/httpd.conf | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 55f9cc88b6f51de1695b6a84b4e4151e68b57637
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jul 21 17:29:01 2009 +0200
512440 - load cobbler-proxy.conf in httpd.conf and load proxy module
(cherry picked from commit a99b3146009841786fb7d1689c56ace7877b080a)
diff --git a/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf b/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf
index a065c7c..7cc80a1 100644
--- a/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf
+++ b/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf
@@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so
#LoadModule mysql_auth_module modules/mod_auth_mysql.so
#LoadModule auth_pgsql_module modules/mod_auth_pgsql.so
#LoadModule digest_module modules/mod_digest.so
-#LoadModule proxy_module modules/libproxy.so
+LoadModule proxy_module modules/libproxy.so
#LoadModule cern_meta_module modules/mod_cern_meta.so
LoadModule expires_module modules/mod_expires.so
LoadModule headers_module modules/mod_headers.so
@@ -318,7 +318,7 @@ AddModule mod_auth_anon.c
#AddModule mod_auth_mysql.c
#AddModule mod_auth_pgsql.c
#AddModule mod_digest.c
-#AddModule mod_proxy.c
+AddModule mod_proxy.c
#AddModule mod_cern_meta.c
AddModule mod_expires.c
AddModule mod_headers.c
@@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \
</IfDefine>
Include conf/rhn_proxy.conf
+Include conf/cobbler-proxy.conf
diff --git a/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf b/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf
index a065c7c..7cc80a1 100644
--- a/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf
+++ b/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf
@@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so
#LoadModule mysql_auth_module modules/mod_auth_mysql.so
#LoadModule auth_pgsql_module modules/mod_auth_pgsql.so
#LoadModule digest_module modules/mod_digest.so
-#LoadModule proxy_module modules/libproxy.so
+LoadModule proxy_module modules/libproxy.so
#LoadModule cern_meta_module modules/mod_cern_meta.so
LoadModule expires_module modules/mod_expires.so
LoadModule headers_module modules/mod_headers.so
@@ -318,7 +318,7 @@ AddModule mod_auth_anon.c
#AddModule mod_auth_mysql.c
#AddModule mod_auth_pgsql.c
#AddModule mod_digest.c
-#AddModule mod_proxy.c
+AddModule mod_proxy.c
#AddModule mod_cern_meta.c
AddModule mod_expires.c
AddModule mod_headers.c
@@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \
</IfDefine>
Include conf/rhn_proxy.conf
+Include conf/cobbler-proxy.conf
diff --git a/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf b/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf
index a065c7c..7cc80a1 100644
--- a/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf
+++ b/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf
@@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so
#LoadModule mysql_auth_module modules/mod_auth_mysql.so
#LoadModule auth_pgsql_module modules/mod_auth_pgsql.so
#LoadModule digest_module modules/mod_digest.so
-#LoadModule proxy_module modules/libproxy.so
+LoadModule proxy_module modules/libproxy.so
#LoadModule cern_meta_module modules/mod_cern_meta.so
LoadModule expires_module modules/mod_expires.so
LoadModule headers_module modules/mod_headers.so
@@ -318,7 +318,7 @@ AddModule mod_auth_anon.c
#AddModule mod_auth_mysql.c
#AddModule mod_auth_pgsql.c
#AddModule mod_digest.c
-#AddModule mod_proxy.c
+AddModule mod_proxy.c
#AddModule mod_cern_meta.c
AddModule mod_expires.c
AddModule mod_headers.c
@@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \
</IfDefine>
Include conf/rhn_proxy.conf
+Include conf/cobbler-proxy.conf
diff --git a/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf b/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf
index a065c7c..7cc80a1 100644
--- a/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf
+++ b/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf
@@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so
#LoadModule mysql_auth_module modules/mod_auth_mysql.so
#LoadModule auth_pgsql_module modules/mod_auth_pgsql.so
#LoadModule digest_module modules/mod_digest.so
-#LoadModule proxy_module modules/libproxy.so
+LoadModule proxy_module modules/libproxy.so
#LoadModule cern_meta_module modules/mod_cern_meta.so
LoadModule expires_module modules/mod_expires.so
LoadModule headers_module modules/mod_headers.so
@@ -318,7 +318,7 @@ AddModule mod_auth_anon.c
#AddModule mod_auth_mysql.c
#AddModule mod_auth_pgsql.c
#AddModule mod_digest.c
-#AddModule mod_proxy.c
+AddModule mod_proxy.c
#AddModule mod_cern_meta.c
AddModule mod_expires.c
AddModule mod_headers.c
@@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \
</IfDefine>
Include conf/rhn_proxy.conf
+Include conf/cobbler-proxy.conf