Changes to 'refs/tags/spacewalk-java-1.5.30-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.30-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-17 14:09 +0000
Tagging package [spacewalk-java] version [1.5.30-1] in directory [java/].
Changes since spacewalk-web-1.5.11-1:
Tomas Lestach (2):
643905 - make sure hibernate doesn't use cached kickstart trees, but takes actual DB state
Automatic commit of package [spacewalk-java] release [1.5.30-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 1 +
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 999b611ccc04129b19edaa12bd8ac04a39e2a361
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 17 16:09:29 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 07474f2..40bf1a7 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.29
+Version: 1.5.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 17 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.30-1
+- 643905 - make sure hibernate doesn't use cached kickstart trees, but takes
+ actual DB state (tlestach(a)redhat.com)
+
* Mon May 16 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
- 704446 - removed unnecessary cast to string
- fixed SQL typo
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a0ee98f..7240d27 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.29-1 java/
+1.5.30-1 java/
12 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 96f0e4c685d5de25fb9b7718f680805fbef2f47d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 16 12:22:58 2011 +0200
643905 - make sure hibernate doesn't use cached kickstart trees, but takes actual DB state
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 3238ead..a5b2c86 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -589,6 +589,7 @@ public class KickstartFactory extends HibernateFactory {
List retval = null;
String query = "KickstartableTree.findAccessibleToOrg";
session = HibernateFactory.getSession();
+ session.evict(KickstartableTree.class);
retval = session.getNamedQuery(query).
setLong("org_id", org.getId().longValue()).list();
return retval;
12 years, 11 months
Changes to 'refs/tags/spacewalk-web-1.5.11-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.11-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-17 13:33 +0000
Tagging package [spacewalk-web] version [1.5.11-1] in directory [web/].
Changes since spacewalk-config-1.5.4-1:
Jan Pazdziora (2):
Removal of create_channel_families and create_channels made InvalidEntryError unused, removing.
Refactoring of make_evr made MakeEvrError unused, removing.
Michael Mraka (1):
702684 - made MPM_Header compatible with RPM_Header
Miroslav Suchý (2):
spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent -> equivalent, equivalence, univalent
Automatic commit of package [spacewalk-web] release [1.5.11-1].
---
backend/common/rhn_mpm.py | 3 +++
backend/server/rhnChannel.py | 3 ---
backend/server/rhnDependency.py | 3 ---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 8 ++++++--
5 files changed, 10 insertions(+), 9 deletions(-)
---
12 years, 11 months
2 commits - rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 2c64dc8496df64a8f0e576ecbb94a38c7fd16704
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 15:33:34 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.11-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index e603a37..0b24adf 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.10-1 web/
+1.5.11-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 36c3d04..5a88888 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.10
+Version: 1.5.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 17 2011 Miroslav Suchý 1.5.11-1
+- spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent ->
+ equivalent, equivalence, univalent (msuchy(a)redhat.com)
+
* Tue May 17 2011 Miroslav Suchý 1.5.10-1
- add GPLv2 LICENSE
- migrate .htaccess files to apache core configuration
commit 1d44ee55756c2ca15b3e72305de8b1eb3656ce5f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 15:32:38 2011 +0200
spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent -> equivalent, equivalence, univalent
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 16cec48..36c3d04 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -97,7 +97,7 @@ Provides: rhn-pxt = 5.3.0
%description -n spacewalk-pxt
This package is the core software of the new Spacewalk site. It is responsible
for HTML, XML, WML, HDML, and SOAP output of data. It is more or less
-equlivalent to things like Apache::ASP and Mason
+equivalent to things like Apache::ASP and Mason
%package -n spacewalk-sniglets
12 years, 11 months
2 commits - backend/server
by Jan Pazdziora
backend/server/rhnChannel.py | 3 ---
backend/server/rhnDependency.py | 3 ---
2 files changed, 6 deletions(-)
New commits:
commit 1e78556fe9468611e9cfd49de9f11dc43ddb2444
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 17 11:47:04 2011 +0200
Refactoring of make_evr made MakeEvrError unused, removing.
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index 4641c68..8afc925 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -284,9 +284,6 @@ class SolveDependenciesError(Exception):
self.deps = deps
self.packages = packages
-class MakeEvrError(SolveDependenciesError):
- pass
-
def __single_query_with_arch_and_id(server_id, deps, query):
""" Run one of the queries and return the results along with the arch. """
ret = {}
commit 3a9554d9e68d38436faf0d7a5131ab3921ffb44e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 17 11:43:02 2011 +0200
Removal of create_channel_families and create_channels made InvalidEntryError unused, removing.
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index c123b96..b3db511 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -55,9 +55,6 @@ class ModifiedError(ChannelException):
class IncompatibilityError(Exception):
pass
-class InvalidEntryError(Exception):
- pass
-
class InvalidDataError(Exception):
pass
12 years, 11 months
backend/common
by Michael Mraka
backend/common/rhn_mpm.py | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 64bdfa60edcb850508548138439b3179202726c7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 17 11:35:39 2011 +0200
702684 - made MPM_Header compatible with RPM_Header
fixing
rhnpush --newest package*.mpm
...
ERROR: unhandled exception occurred: ('dict' object has no attribute 'unload').
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index 1306f61..19bd783 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -117,6 +117,9 @@ class MPM_Header:
def checksum_type(self):
return MPM_CHECKSUM_TYPE
+ def unload(self):
+ return None
+
class InvalidPackageError(Exception):
pass
12 years, 11 months
Changes to 'refs/tags/spacewalk-config-1.5.4-1'
by Miroslav Suchý
Tag 'spacewalk-config-1.5.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-17 06:57 +0000
Tagging package [spacewalk-config] version [1.5.4-1] in directory [spacewalk/config/].
Changes since oracle-lib-compat-11.2.0.5-1:
Miroslav Suchý (32):
cleanup - system_list is not referenced from anywhere
migrate .htaccess from network/systems/groups to apache core configuration
migrate .htaccess from network/systems/details to apache core configuration
migrate .htaccess from network/systems/details/history to apache core configuration
migrate .htaccess from network/systems/details/history/snapshots to apache core configuration
migrate .htaccess from network/systems/details/kickstart to apache core configuration
migrate .htaccess from network/systems/details/proxy to apache core configuration
migrate .htaccess from network/systems/ssm to apache core configuration
migrate .htaccess from network/systems/ssm/misc to apache core configuration
migrate .htaccess from network/systems/ssm/groups to apache core configuration
migrate .htaccess from network/systems/ssm/provisioning to apache core configuration
migrate .htaccess from network/ to apache core configuration
migrate .htaccess from network/users to apache core configuration
migrate .htaccess from network/users/details to apache core configuration
migrate .htaccess from network/users/details/contact_methods to apache core configuration
migrate .htaccess from network/monitoring to apache core configuration
migrate .htaccess from network/monitoring/scout to apache core configuration
migrate .htaccess from network/components to apache core configuration
migrate .htaccess from network/software/channels to apache core configuration
migrate .htaccess from network/software/channels/manage to apache core configuration
migrate .htaccess from network/software/channels/manage/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/packages/compare to apache core configuration
migrate .htaccess from network/software/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/errata to apache core configuration
migrate .htaccess from network/errata to apache core configuration
migrate .htaccess from network/errata/manage to apache core configuration
migrate .htaccess from nav/ to apache core configuration
migrate .htaccess from formletters/ to apache core configuration
migrate .htaccess from applications/ to apache core configuration
add GPLv2 LICENSE
Automatic commit of package [spacewalk-web] release [1.5.10-1].
Automatic commit of package [spacewalk-config] release [1.5.4-1].
---
rel-eng/packages/spacewalk-config | 2
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 307 +++++++++
spacewalk/config/spacewalk-config.spec | 5
web/LICENSE | 339 ++++++++++
web/html/applications/.htaccess | 8
web/html/formletters/.htaccess | 8
web/html/nav/.htaccess | 8
web/html/network/.htaccess | 10
web/html/network/components/.htaccess | 8
web/html/network/errata/.htaccess | 6
web/html/network/errata/manage/.htaccess | 9
web/html/network/monitoring/.htaccess | 6
web/html/network/monitoring/scout/.htaccess | 8
web/html/network/software/channels/.htaccess | 15
web/html/network/software/channels/manage/.htaccess | 9
web/html/network/software/channels/manage/errata/.htaccess | 9
web/html/network/software/channels/manage/packages/.htaccess | 9
web/html/network/software/channels/manage/packages/compare/.htaccess | 10
web/html/network/software/packages/.htaccess | 13
web/html/network/systems/.htaccess | 6
web/html/network/systems/details/.htaccess | 30
web/html/network/systems/details/history/.htaccess | 6
web/html/network/systems/details/history/snapshots/.htaccess | 7
web/html/network/systems/details/kickstart/.htaccess | 7
web/html/network/systems/details/proxy/.htaccess | 8
web/html/network/systems/groups/.htaccess | 71 --
web/html/network/systems/ssm/.htaccess | 7
web/html/network/systems/ssm/groups/.htaccess | 7
web/html/network/systems/ssm/misc/.htaccess | 35 -
web/html/network/systems/ssm/provisioning/.htaccess | 7
web/html/network/systems/system_list | 52 -
web/html/network/users/.htaccess | 7
web/html/network/users/details/.htaccess | 9
web/html/network/users/details/contact_methods/.htaccess | 8
web/spacewalk-web.spec | 7
36 files changed, 658 insertions(+), 407 deletions(-)
---
12 years, 11 months
Changes to 'refs/tags/spacewalk-web-1.5.10-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.10-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-17 06:57 +0000
Tagging package [spacewalk-web] version [1.5.10-1] in directory [web/].
Changes since oracle-lib-compat-11.2.0.5-1:
Miroslav Suchý (31):
cleanup - system_list is not referenced from anywhere
migrate .htaccess from network/systems/groups to apache core configuration
migrate .htaccess from network/systems/details to apache core configuration
migrate .htaccess from network/systems/details/history to apache core configuration
migrate .htaccess from network/systems/details/history/snapshots to apache core configuration
migrate .htaccess from network/systems/details/kickstart to apache core configuration
migrate .htaccess from network/systems/details/proxy to apache core configuration
migrate .htaccess from network/systems/ssm to apache core configuration
migrate .htaccess from network/systems/ssm/misc to apache core configuration
migrate .htaccess from network/systems/ssm/groups to apache core configuration
migrate .htaccess from network/systems/ssm/provisioning to apache core configuration
migrate .htaccess from network/ to apache core configuration
migrate .htaccess from network/users to apache core configuration
migrate .htaccess from network/users/details to apache core configuration
migrate .htaccess from network/users/details/contact_methods to apache core configuration
migrate .htaccess from network/monitoring to apache core configuration
migrate .htaccess from network/monitoring/scout to apache core configuration
migrate .htaccess from network/components to apache core configuration
migrate .htaccess from network/software/channels to apache core configuration
migrate .htaccess from network/software/channels/manage to apache core configuration
migrate .htaccess from network/software/channels/manage/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/packages/compare to apache core configuration
migrate .htaccess from network/software/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/errata to apache core configuration
migrate .htaccess from network/errata to apache core configuration
migrate .htaccess from network/errata/manage to apache core configuration
migrate .htaccess from nav/ to apache core configuration
migrate .htaccess from formletters/ to apache core configuration
migrate .htaccess from applications/ to apache core configuration
add GPLv2 LICENSE
Automatic commit of package [spacewalk-web] release [1.5.10-1].
---
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 307 +++++++++
web/LICENSE | 339 ++++++++++
web/html/applications/.htaccess | 8
web/html/formletters/.htaccess | 8
web/html/nav/.htaccess | 8
web/html/network/.htaccess | 10
web/html/network/components/.htaccess | 8
web/html/network/errata/.htaccess | 6
web/html/network/errata/manage/.htaccess | 9
web/html/network/monitoring/.htaccess | 6
web/html/network/monitoring/scout/.htaccess | 8
web/html/network/software/channels/.htaccess | 15
web/html/network/software/channels/manage/.htaccess | 9
web/html/network/software/channels/manage/errata/.htaccess | 9
web/html/network/software/channels/manage/packages/.htaccess | 9
web/html/network/software/channels/manage/packages/compare/.htaccess | 10
web/html/network/software/packages/.htaccess | 13
web/html/network/systems/.htaccess | 6
web/html/network/systems/details/.htaccess | 30
web/html/network/systems/details/history/.htaccess | 6
web/html/network/systems/details/history/snapshots/.htaccess | 7
web/html/network/systems/details/kickstart/.htaccess | 7
web/html/network/systems/details/proxy/.htaccess | 8
web/html/network/systems/groups/.htaccess | 71 --
web/html/network/systems/ssm/.htaccess | 7
web/html/network/systems/ssm/groups/.htaccess | 7
web/html/network/systems/ssm/misc/.htaccess | 35 -
web/html/network/systems/ssm/provisioning/.htaccess | 7
web/html/network/systems/system_list | 52 -
web/html/network/users/.htaccess | 7
web/html/network/users/details/.htaccess | 9
web/html/network/users/details/contact_methods/.htaccess | 8
web/spacewalk-web.spec | 7
34 files changed, 653 insertions(+), 405 deletions(-)
---
12 years, 11 months
32 commits - rel-eng/packages spacewalk/config web/html web/LICENSE web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-config | 2
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 307 +++++++++
spacewalk/config/spacewalk-config.spec | 5
web/LICENSE | 339 ++++++++++
web/html/applications/.htaccess | 8
web/html/formletters/.htaccess | 8
web/html/nav/.htaccess | 8
web/html/network/.htaccess | 10
web/html/network/components/.htaccess | 8
web/html/network/errata/.htaccess | 6
web/html/network/errata/manage/.htaccess | 9
web/html/network/monitoring/.htaccess | 6
web/html/network/monitoring/scout/.htaccess | 8
web/html/network/software/channels/.htaccess | 15
web/html/network/software/channels/manage/.htaccess | 9
web/html/network/software/channels/manage/errata/.htaccess | 9
web/html/network/software/channels/manage/packages/.htaccess | 9
web/html/network/software/channels/manage/packages/compare/.htaccess | 10
web/html/network/software/packages/.htaccess | 13
web/html/network/systems/.htaccess | 6
web/html/network/systems/details/.htaccess | 30
web/html/network/systems/details/history/.htaccess | 6
web/html/network/systems/details/history/snapshots/.htaccess | 7
web/html/network/systems/details/kickstart/.htaccess | 7
web/html/network/systems/details/proxy/.htaccess | 8
web/html/network/systems/groups/.htaccess | 71 --
web/html/network/systems/ssm/.htaccess | 7
web/html/network/systems/ssm/groups/.htaccess | 7
web/html/network/systems/ssm/misc/.htaccess | 35 -
web/html/network/systems/ssm/provisioning/.htaccess | 7
web/html/network/systems/system_list | 52 -
web/html/network/users/.htaccess | 7
web/html/network/users/details/.htaccess | 9
web/html/network/users/details/contact_methods/.htaccess | 8
web/spacewalk-web.spec | 7
36 files changed, 658 insertions(+), 407 deletions(-)
New commits:
commit 46a22b3162e37d1929d35474050f6d8e3d87dc81
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:57:37 2011 +0200
Automatic commit of package [spacewalk-config] release [1.5.4-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 5ffc19a..24368e7 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.5.3-1 spacewalk/config/
+1.5.4-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 9014100..8d7bb7c 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -105,6 +105,9 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* || :
%changelog
+* Tue May 17 2011 Miroslav Suchý 1.5.4-1
+- migrate .htaccess files to apache core configuration
+
* Tue May 03 2011 Jan Pazdziora 1.5.3-1
- We restrict access to some files that were too open in the past (some of them
are not tracked by rpm).
commit 35e61c9f56a63779d4b72107175b51b6eedceaae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:57:02 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 67c69c3..e603a37 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.9-1 web/
+1.5.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e7f25f6..16cec48 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.9
+Version: 1.5.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 17 2011 Miroslav Suchý 1.5.10-1
+- add GPLv2 LICENSE
+- migrate .htaccess files to apache core configuration
+
* Mon May 16 2011 Miroslav Suchý 1.5.9-1
- cleanup - removing old files, and unused sections in .htaccess
commit f5e757c6a73411aa260f333e256045cc8fce09ef
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:53:16 2011 +0200
add GPLv2 LICENSE
diff --git a/web/LICENSE b/web/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/web/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/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 3164f77..e7f25f6 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -223,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/DB.pm
%{perl_vendorlib}/PXT/Config.pm
%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
+%doc LICENSE
%files -n spacewalk-dobby
%defattr(644,root,root,755)
commit 4d0354dba85b8d6d598c9414feab0eb0ff527a1f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:45:22 2011 +0200
migrate .htaccess from applications/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 0b93194..423646d 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -399,3 +399,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require no-access
</Directory>
+
+<Directory "/var/www/html/applications">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/applications/.htaccess b/web/html/applications/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/applications/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit 7812a69513419766b451ab0f40589d9d90bb0d7f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:43:42 2011 +0200
migrate .htaccess from formletters/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 9d20b41..0b93194 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -392,3 +392,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require no-access
</Directory>
+
+<Directory "/var/www/html/formletters">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/formletters/.htaccess b/web/html/formletters/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/formletters/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit 01b6dc2bcd7ea1973d4e8db43168122ae69d9b9e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:42:10 2011 +0200
migrate .htaccess from nav/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 6d5a758..9d20b41 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -385,3 +385,10 @@ PerlModule PXT::ApacheAuth
PerlSetVar errata_context manage
</Directory>
+
+<Directory "/var/www/html/nav">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/nav/.htaccess b/web/html/nav/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/nav/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit eac8be4357bc898a4a20e5ea40165cc1986db0ff
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:40:16 2011 +0200
migrate .htaccess from network/errata/manage to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 48a61f9..6d5a758 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -376,3 +376,12 @@ PerlModule PXT::ApacheAuth
PerlHandler PXT::ApacheHandler
</Files>
</Directory>
+
+<Directory "/var/www/html/network/errata/manage">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(channel_admin)
+
+ PerlSetVar errata_context manage
+</Directory>
diff --git a/web/html/network/errata/manage/.htaccess b/web/html/network/errata/manage/.htaccess
deleted file mode 100644
index 304f6f5..0000000
--- a/web/html/network/errata/manage/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(channel_admin)
-
-PerlSetVar errata_context manage
commit 56047c053fe8c9802d7a5f1e86d39b8f9ffb54dd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:38:40 2011 +0200
migrate .htaccess from network/errata to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index c7f3523..48a61f9 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -368,3 +368,11 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/errata">
+ <Files errata_list>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
diff --git a/web/html/network/errata/.htaccess b/web/html/network/errata/.htaccess
deleted file mode 100644
index 3cf9c39..0000000
--- a/web/html/network/errata/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files errata_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit c0d7e2c6bbd709710d324967ae6489a9e0f626f6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:36:57 2011 +0200
migrate .htaccess from network/software/channels/manage/errata to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e418b1e..c7f3523 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -359,3 +359,12 @@ PerlModule PXT::ApacheAuth
PerlHandler PXT::ApacheHandler
</Files>
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage/errata">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/errata/.htaccess b/web/html/network/software/channels/manage/errata/.htaccess
deleted file mode 100644
index 7f741b8..0000000
--- a/web/html/network/software/channels/manage/errata/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
commit 4e5bacc703478c2afd6ef1e9dba98ea99e873b92
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:29:46 2011 +0200
migrate .htaccess from network/software/packages to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e6fcf53..e418b1e 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -345,3 +345,17 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/software/packages">
+ <Files package_map_raw>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+
+ <Files view_readme>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
diff --git a/web/html/network/software/packages/.htaccess b/web/html/network/software/packages/.htaccess
deleted file mode 100644
index d0bb12d..0000000
--- a/web/html/network/software/packages/.htaccess
+++ /dev/null
@@ -1,13 +0,0 @@
-<Files package_map_raw>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
-
-<Files view_readme>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit 52b8b81e1f5f2a5f6f41668cb1b3d8009f58604c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:27:54 2011 +0200
migrate .htaccess from network/software/channels/manage/packages/compare to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 4a8545a..e6fcf53 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -336,3 +336,12 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage/packages/compare">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/packages/compare/.htaccess b/web/html/network/software/channels/manage/packages/compare/.htaccess
deleted file mode 100644
index b119c59..0000000
--- a/web/html/network/software/channels/manage/packages/compare/.htaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
-
commit d0fa12001f71d90a8212d547e0f92ff4901eed1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:26:26 2011 +0200
migrate .htaccess from network/software/channels/manage/packages to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 17d4695..4a8545a 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -327,3 +327,12 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage/packages">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/packages/.htaccess b/web/html/network/software/channels/manage/packages/.htaccess
deleted file mode 100644
index 7f741b8..0000000
--- a/web/html/network/software/channels/manage/packages/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
commit 17b60b2e6d304f792cedc7b0bb722a1c6dbe5867
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:24:45 2011 +0200
migrate .htaccess from network/software/channels/manage to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 0f457d7..17d4695 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -318,3 +318,12 @@ PerlModule PXT::ApacheAuth
require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()
</Files>
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/.htaccess b/web/html/network/software/channels/manage/.htaccess
deleted file mode 100644
index 7f741b8..0000000
--- a/web/html/network/software/channels/manage/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
commit 7c9085453c7b4e2b479d645f103757ccd2abbea5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:23:25 2011 +0200
migrate .htaccess from network/software/channels to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index be1b565..0f457d7 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -304,3 +304,17 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require no-access
</Directory>
+
+<Directory "/var/www/html/network/software/channels">
+ AuthType Basic
+ AuthName "RHN Channel Area"
+ PerlAuthenHandler PXT::ApacheAuth
+
+ <Files subscribers.pxt>
+ require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()
+ </Files>
+
+ <Files managers.pxt>
+ require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()
+ </Files>
+</Directory>
diff --git a/web/html/network/software/channels/.htaccess b/web/html/network/software/channels/.htaccess
deleted file mode 100644
index a34cdbd..0000000
--- a/web/html/network/software/channels/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-
-<Files subscribers.pxt>
- require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()
-</Files>
-
-<Files managers.pxt>
- require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()
-</Files>
-
commit 5fd1fe71f5b01439cab1781f302fc606a23c31a8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 21:05:54 2011 +0200
migrate .htaccess from network/components to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index a8d7b4f..be1b565 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -297,3 +297,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(monitoring_admin)
</Directory>
+
+<Directory "/var/www/html/network/components">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/network/components/.htaccess b/web/html/network/components/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/network/components/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit b37325fdf71b647b3bc97721da23209a6ea75550
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 21:03:45 2011 +0200
migrate .htaccess from network/monitoring/scout to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 060fe78..a8d7b4f 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -290,3 +290,10 @@ PerlModule PXT::ApacheAuth
AuthName "RHN Monitoring Area"
PerlAuthenHandler PXT::ApacheAuth
</Directory>
+
+<Directory "/var/www/html/network/monitoring/scout">
+ AuthType Basic
+ AuthName "RHN Monitoring Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(monitoring_admin)
+</Directory>
diff --git a/web/html/network/monitoring/scout/.htaccess b/web/html/network/monitoring/scout/.htaccess
deleted file mode 100644
index 5da75a8..0000000
--- a/web/html/network/monitoring/scout/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
commit 68ad8f8279753f59aa42087ae479bf2a42dfcd24
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:55:25 2011 +0200
migrate .htaccess from network/monitoring to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 7745822..060fe78 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -284,3 +284,9 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl org_entitlement(rhn_monitor)
</Directory>
+
+<Directory "/var/www/html/network/monitoring">
+ AuthType Basic
+ AuthName "RHN Monitoring Area"
+ PerlAuthenHandler PXT::ApacheAuth
+</Directory>
diff --git a/web/html/network/monitoring/.htaccess b/web/html/network/monitoring/.htaccess
deleted file mode 100644
index 6892bf6..0000000
--- a/web/html/network/monitoring/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
commit ccfae52e7488e2f2aaebf27fe40de3be63220caf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:49:38 2011 +0200
migrate .htaccess from network/users/details/contact_methods to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 38fb99c..7745822 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -277,3 +277,10 @@ PerlModule PXT::ApacheAuth
require acl user_role(org_admin)
</Files>
</Directory>
+
+<Directory "/var/www/html/network/users/details/contact_methods">
+ AuthType Basic
+ AuthName "RHN Monitoring Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl org_entitlement(rhn_monitor)
+</Directory>
diff --git a/web/html/network/users/details/contact_methods/.htaccess b/web/html/network/users/details/contact_methods/.htaccess
deleted file mode 100644
index b831324..0000000
--- a/web/html/network/users/details/contact_methods/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
- AuthType Basic
- AuthName "RHN Monitoring Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl org_entitlement(rhn_monitor)
commit 64e5f41b67c6f2c05815d62267496eb31626a9f2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:47:35 2011 +0200
migrate .htaccess from network/users/details to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 5fdde26..38fb99c 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -268,3 +268,12 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
</Directory>
+
+<Directory "/var/www/html/network/users/details">
+ <Files delete_confirm.pxt>
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(org_admin)
+ </Files>
+</Directory>
diff --git a/web/html/network/users/details/.htaccess b/web/html/network/users/details/.htaccess
deleted file mode 100644
index 094e49d..0000000
--- a/web/html/network/users/details/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-<Files delete_confirm.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(org_admin)
-</Files>
commit b883c9b586a0521332821ff8498d73c772a40b29
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:45:11 2011 +0200
migrate .htaccess from network/users to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e894d3d..5fdde26 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -261,3 +261,10 @@ PerlModule PXT::ApacheAuth
DirectoryIndex index.pxt
Options -Indexes
</Directory>
+
+<Directory "/var/www/html/network/users">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
+</Directory>
diff --git a/web/html/network/users/.htaccess b/web/html/network/users/.htaccess
deleted file mode 100644
index 169b348..0000000
--- a/web/html/network/users/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
commit 3f4dcd8cce9e8f9739a4e3a05553e66dea41778c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:42:02 2011 +0200
migrate .htaccess from network/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 950a9e9..e894d3d 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -252,3 +252,12 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl org_entitlement(rhn_provisioning)
</Directory>
+
+<Directory "/var/www/html/network">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require valid-user
+ DirectoryIndex index.pxt
+ Options -Indexes
+</Directory>
diff --git a/web/html/network/.htaccess b/web/html/network/.htaccess
deleted file mode 100644
index 253b00f..0000000
--- a/web/html/network/.htaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require valid-user
-
-DirectoryIndex index.pxt
-Options -Indexes
commit b206aed2c5bd66225448ad2f2f3458fd9eca98ad
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:40:00 2011 +0200
migrate .htaccess from network/systems/ssm/provisioning to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 4803998..950a9e9 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -245,3 +245,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm/provisioning">
+ AuthType Basic
+ AuthName "RHN Custom Info Management"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl org_entitlement(rhn_provisioning)
+</Directory>
diff --git a/web/html/network/systems/ssm/provisioning/.htaccess b/web/html/network/systems/ssm/provisioning/.htaccess
deleted file mode 100644
index d7c6b76..0000000
--- a/web/html/network/systems/ssm/provisioning/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Custom Info Management"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl org_entitlement(rhn_provisioning)
commit 8d65389708f770d01aa05d7f2e169ebb8eafdad9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:54:50 2011 +0200
migrate .htaccess from network/systems/ssm/groups to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 2a190ec..4803998 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -238,3 +238,10 @@ PerlModule PXT::ApacheAuth
require acl org_entitlement(rhn_provisioning)
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm/groups">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
+</Directory>
diff --git a/web/html/network/systems/ssm/groups/.htaccess b/web/html/network/systems/ssm/groups/.htaccess
deleted file mode 100644
index 169b348..0000000
--- a/web/html/network/systems/ssm/groups/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
commit ef4463bd3ea43cd9b342dcbfda54e46c2d5018d2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:52:33 2011 +0200
migrate .htaccess from network/systems/ssm/misc to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index a25122f..2a190ec 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -208,3 +208,33 @@ PerlModule PXT::ApacheAuth
AuthName "RHN System Set Manager"
PerlAuthenHandler PXT::ApacheAuth
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm/misc">
+ <Files choose_value_to_remove.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+
+ <Files choose_value_to_set.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+
+ <Files set_value.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+
+ <Files remove_value.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/ssm/misc/.htaccess b/web/html/network/systems/ssm/misc/.htaccess
deleted file mode 100644
index 3ba65ee..0000000
--- a/web/html/network/systems/ssm/misc/.htaccess
+++ /dev/null
@@ -1,35 +0,0 @@
-<Files choose_value_to_remove.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
-<Files choose_value_to_set.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
-<Files set_value.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
-<Files remove_value.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
commit 1b7af884a43c9ab220354c2b7c4c7aa4d944fc00
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:49:13 2011 +0200
migrate .htaccess from network/systems/ssm to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 3791c54..a25122f 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -202,3 +202,9 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require valid-user
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm">
+ AuthType Basic
+ AuthName "RHN System Set Manager"
+ PerlAuthenHandler PXT::ApacheAuth
+</Directory>
diff --git a/web/html/network/systems/ssm/.htaccess b/web/html/network/systems/ssm/.htaccess
deleted file mode 100644
index 924aab3..0000000
--- a/web/html/network/systems/ssm/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN System Set Manager"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-
commit eee5cd12c5647b1902cad5c33dc2552a8ac1a09b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:47:22 2011 +0200
migrate .htaccess from network/systems/details/proxy to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 38530ba..3791c54 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -195,3 +195,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl system_feature(ftr_kickstart)
</Directory>
+
+<Directory "/var/www/html/network/systems/details/proxy">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require valid-user
+</Directory>
diff --git a/web/html/network/systems/details/proxy/.htaccess b/web/html/network/systems/details/proxy/.htaccess
deleted file mode 100644
index 85a38d8..0000000
--- a/web/html/network/systems/details/proxy/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require valid-user
-
commit 399ab831ce50b3ea8d482c9830ebd3687411f7f2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:45:23 2011 +0200
migrate .htaccess from network/systems/details/kickstart to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 2c1fcef..38530ba 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -188,3 +188,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl mixin RHN::Access::System client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting)
</Directory>
+
+<Directory "/var/www/html/network/systems/details/kickstart">
+ AuthType Basic
+ AuthName "RHN Configuration Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl system_feature(ftr_kickstart)
+</Directory>
diff --git a/web/html/network/systems/details/kickstart/.htaccess b/web/html/network/systems/details/kickstart/.htaccess
deleted file mode 100644
index 2161c61..0000000
--- a/web/html/network/systems/details/kickstart/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Configuration Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl system_feature(ftr_kickstart)
commit 847da1ac187c6dc751621bdc45d6687c8f7d2727
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:43:17 2011 +0200
migrate .htaccess from network/systems/details/history/snapshots to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 413bb6b..2c1fcef 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -181,3 +181,10 @@ PerlModule PXT::ApacheAuth
PerlHandler PXT::ApacheHandler
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/details/history/snapshots">
+ AuthType Basic
+ AuthName "RHN Custom Info Management"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl mixin RHN::Access::System client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting)
+</Directory>
diff --git a/web/html/network/systems/details/history/snapshots/.htaccess b/web/html/network/systems/details/history/snapshots/.htaccess
deleted file mode 100644
index db3b00c..0000000
--- a/web/html/network/systems/details/history/snapshots/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Custom Info Management"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl mixin RHN::Access::System client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting)
commit 06a0a4d94937e9cb794da149cba003f355bb175f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:03:02 2011 +0200
migrate .htaccess from network/systems/details/history to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 73be80f..413bb6b 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -173,3 +173,11 @@ PerlModule PXT::ApacheAuth
require acl system_feature(ftr_remote_command)
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/details/history">
+ <Files raw_script_output.txt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/details/history/.htaccess b/web/html/network/systems/details/history/.htaccess
deleted file mode 100644
index 14f11ad..0000000
--- a/web/html/network/systems/details/history/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files raw_script_output.txt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit ca03a8a47a57496070bf38ec68aa1d0bfced0ad5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 18:56:57 2011 +0200
migrate .htaccess from network/systems/details to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 06fe3e3..73be80f 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -151,3 +151,25 @@ PerlModule PXT::ApacheAuth
require acl user_has_access_to_servergroup()
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/details">
+ PerlAuthenHandler PXT::ApacheAuth
+
+ <Files proxy.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
+ </Files>
+
+ <Files activation.pxt>
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ require acl system_feature(ftr_agent_smith)
+ </Files>
+
+ <Files remote_commands.pxt>
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ require acl system_feature(ftr_remote_command)
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
deleted file mode 100644
index a815dcf..0000000
--- a/web/html/network/systems/details/.htaccess
+++ /dev/null
@@ -1,30 +0,0 @@
-<Files proxy.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
-</Files>
-
-<Files activation.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl system_feature(ftr_agent_smith)
-</Files>
-
-<Files remote_commands.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl system_feature(ftr_remote_command)
-</Files>
commit bbf9cea1d439f05b8fc6b025da3c1f1149d9dda7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 17:50:01 2011 +0200
migrate .htaccess from network/systems/groups to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index ee51a0c..06fe3e3 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -99,3 +99,55 @@ RewriteRule .* - [F]
ServerTokens Prod
ServerSignature Off
+
+#### Configuration for pages from spacewalk-web
+
+PerlModule PXT::ApacheHandler
+PerlModule PXT::ApacheAuth
+
+<Directory "/var/www/html/network/systems/groups">
+ AuthType Basic
+ AuthName "RHN System Group List"
+
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl org_entitlement(sw_mgr_enterprise)
+
+ <Files details.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files create.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ </Files>
+
+ <Files admin_list.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files delete_confirm.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files edit_properties.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files errata_list.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_has_access_to_servergroup()
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/groups/.htaccess b/web/html/network/systems/groups/.htaccess
deleted file mode 100644
index 8addf72..0000000
--- a/web/html/network/systems/groups/.htaccess
+++ /dev/null
@@ -1,71 +0,0 @@
-AuthType Basic
-AuthName "RHN System Group List"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl org_entitlement(sw_mgr_enterprise)
-
-<Files details.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_has_access_to_servergroup()
-</Files>
-
-<Files create.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
-</Files>
-
-<Files admin_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
-
-<Files delete_confirm.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
-<Files edit_properties.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
-<Files errata_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_has_access_to_servergroup()
-</Files>
commit fb94fc2e8a19ea4cb288d4ea6bddae53a6ca3717
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 17:18:34 2011 +0200
cleanup - system_list is not referenced from anywhere
diff --git a/web/html/network/systems/.htaccess b/web/html/network/systems/.htaccess
deleted file mode 100644
index ebeb0af..0000000
--- a/web/html/network/systems/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files system_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list
deleted file mode 100644
index 2e36da1..0000000
--- a/web/html/network/systems/system_list
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-replacement mode="legend_canvas">
- <rhn-list-legend type="systems" file="/network/components/legends/system-list-legend.pxi" />
- </grail-canvas-replacement>
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-formvar>
-<rhn-pathinfo-list-mode type="system">
- <h1><img src="/img/rhn-icon-system.gif" alt="system" /> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1>
-
-<rhn-listview class="Sniglets::ListView::SystemList" mode="{pinfo_list_mode}" alphabar_column="name">
- <formvars>
- <var name="view_mode" />
- <var name="cfam_id" />
- </formvars>
-
- <set name="users selected systems" label="system_list" acl="org_entitlement(sw_mgr_enterprise)" />
-
- <column name="Updates" label="advisory_icon" align="center" width="5%" />
-
- <rhn-require acl="org_entitlement(rhn_monitor)">
- <column name="Health" label="monitoring_icon" align="center" width="5%" />
- </rhn-require>
-
- <column name="Errata" label="total_errata" align="center" width="5%">
- <url>/network/systems/details/errata_list.pxt?sid={column:id}</url>
- </column>
- <column name="Packages" label="outdated_packages" align="center" width="5%">
- <url>/network/systems/details/packages/upgrade.pxt?sid={column:id}</url>
- </column>
- <column name="System" label="server_name" sort_by="1" align="left" width="35%">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
- <column name="Base Channel" label="channel_labels" align="left" />
- <column name="Entitlement" label="entitlement_level" width="5%"/>
-
- <empty_list_message>No {pinfo_list_name}</empty_list_message>
-</rhn-listview>
-
-</rhn-pathinfo-list-mode>
-
-</pxt-formvar>
-
- </grail-canvas-template>
-</pxt-passthrough>
12 years, 11 months