spacewalk/setup/bin/spacewalk-setup | 12 ++++++++++++
spacewalk/setup/share/editarea.conf.1 | 7 +++++++
spacewalk/setup/spacewalk-setup.spec | 1 +
3 files changed, 20 insertions(+)
New commits:
commit d02add4b1ce892588f509069966eddfb50aeea77
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Oct 3 15:22:35 2013 +0200
setting up configuration for editarea for apache >= 2.4
editarea is used on Spacewalk. When using Fedora 19 & apache 2.4 getting
/editarea/edit_area_full.js results in Forbidden.
Apache auth is now done in a set of modules for 2.4. According to the
documentation
https://httpd.apache.org/docs/2.4/upgrading.html
2.2 configuration:
Order deny,allow
Deny from all
2.4 configuration:
Require all denied
I am not sure why the default changed, as httpd/conf.d/editarea.conf did
not had a configuration before, but adding the corresponding 2.4 part
fixes the problem.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 5194806..8c826bb 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -31,6 +31,7 @@ use Spacewalk::Setup ();
use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
use IO::Socket ();
use RHN::DB ();
+use File::Copy;
my $DEBUG;
$DEBUG = 0;
@@ -138,6 +139,9 @@ Spacewalk::Setup::update_monitoring_ack_enqueuer(\%opts, \%answers);
print Spacewalk::Setup::loc("* Configuring apache SSL virtual host.\n");
setup_ssl_vhost(\%opts, \%answers);
+print Spacewalk::Setup::loc("* Configuring editarea.\n");
+setup_editarea();
+
print Spacewalk::Setup::loc("* Configuring tomcat.\n");
setup_tomcat(\%opts, \%answers);
@@ -537,6 +541,14 @@ sub setup_ssl_vhost {
return;
}
+sub setup_editarea {
+ my $conf_file = "/etc/httpd/conf.d/editarea.conf";
+ if( -e $conf_file) {
+ Spacewalk::Setup::backup_file("/etc/httpd/conf.d",
"editarea.conf");
+ }
+ copy(Spacewalk::Setup::SHARED_DIR . "/editarea.conf.1", $conf_file);
+}
+
sub setup_tomcat {
my $opts = shift;
my $answers = shift;
diff --git a/spacewalk/setup/share/editarea.conf.1
b/spacewalk/setup/share/editarea.conf.1
new file mode 100644
index 0000000..ab90b9c
--- /dev/null
+++ b/spacewalk/setup/share/editarea.conf.1
@@ -0,0 +1,7 @@
+alias /editarea /usr/share/editarea
+
+<IfVersion >= 2.4>
+<Directory /usr/share/editarea>
+Require all granted
+</Directory>
+</IfVersion>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 5a6d9a7..2b8e4c5 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -57,6 +57,7 @@ install -m 0755 share/embedded_diskspace_check.py
%{buildroot}/%{_datadir}/space
install -m 0644 share/sudoers.* %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.* %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcat.* %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/editarea.conf.* %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/server.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/web.xml.patch %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/