diff options
| author | Ade Lee <alee@redhat.com> | 2012-08-13 14:01:02 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-08-15 15:38:45 -0400 |
| commit | 7a6b89591732f872db38821c00ec3ce89ef57e7a (patch) | |
| tree | 4580ce2c5583ba2ff96b77ebdaa02f3c1287c406 /base/ra/apache | |
| parent | 87b5eaa5b1409bc362867e3849fe16c8f205afa9 (diff) | |
| download | pki-7a6b89591732f872db38821c00ec3ce89ef57e7a.tar.gz pki-7a6b89591732f872db38821c00ec3ce89ef57e7a.tar.xz pki-7a6b89591732f872db38821c00ec3ce89ef57e7a.zip | |
Changes to get TPS and RA running on dogtag 10
Added systemd scripts for RA and TPS. Modified init scripts
and configuration files to use correct directives for httpd 2.4.
TPS and RA subsystems are now installable using pkicreate
Diffstat (limited to 'base/ra/apache')
| -rw-r--r-- | base/ra/apache/conf/httpd.conf | 22 | ||||
| -rw-r--r-- | base/ra/apache/conf/perl.conf | 6 |
2 files changed, 13 insertions, 15 deletions
diff --git a/base/ra/apache/conf/httpd.conf b/base/ra/apache/conf/httpd.conf index f89e43b33..180c08de0 100644 --- a/base/ra/apache/conf/httpd.conf +++ b/base/ra/apache/conf/httpd.conf @@ -232,8 +232,13 @@ Listen [PORT] # LoadModule foo_module modules/mod_foo.so # -# Required modules for command 'Order': +# MPM worker module is a loadable module as of 2.4 +LoadModule mpm_worker_module /etc/httpd/modules/mod_mpm_worker.so + +LoadModule authz_core_module /etc/httpd/modules/mod_authz_core.so [FORTITUDE_AUTH_MODULES] +# Module for User and Group +LoadModule unixd_module /etc/httpd/modules/mod_unixd.so # Required module for command 'UserDir': LoadModule userdir_module [FORTITUDE_LIB_DIR]/modules/mod_userdir.so # Required module for command 'DirectoryIndex': @@ -394,8 +399,7 @@ DocumentRoot "[SERVER_ROOT]/docroot" # # Controls who can get stuff from this server. # - Order allow,deny - Allow from all + Require all granted </Directory> @@ -444,8 +448,7 @@ AccessFileName .htaccess # viewed by Web clients. # <Files ~ "^\.ht"> - Order allow,deny - Deny from all + Require all denied </Files> # @@ -592,8 +595,7 @@ Alias /icons/ "[SERVER_ROOT]/icons/" <Directory "[SERVER_ROOT]/icons"> Options Indexes MultiViews AllowOverride None - Order allow,deny - Allow from all + Require all granted </Directory> # @@ -606,8 +608,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "[SERVER_ROOT]/manual$1 <Directory "[SERVER_ROOT]/manual"> Options Indexes AllowOverride None - Order allow,deny - Allow from all + Require all granted <Files *.html> SetHandler type-map @@ -642,8 +643,7 @@ ScriptAlias /cgi-bin/ "[SERVER_ROOT]/cgi-bin/" <Directory "[SERVER_ROOT]/cgi-bin"> AllowOverride None Options ExecCGI - Order allow,deny - Allow from all + Require all granted </Directory> # diff --git a/base/ra/apache/conf/perl.conf b/base/ra/apache/conf/perl.conf index 50139cdab..02a503f74 100644 --- a/base/ra/apache/conf/perl.conf +++ b/base/ra/apache/conf/perl.conf @@ -58,15 +58,13 @@ PerlSetEnv PKI_ROOT [SERVER_ROOT] <Location /ra/admin/console/config/wizard> SetHandler perl-script PerlHandler PKI::RA::Wizard - Order deny,allow - Allow from all + Require all granted </Location> <Location /ra/admin/console/config/login> SetHandler perl-script PerlHandler PKI::RA::Login - Order deny,allow - Allow from all + Require all granted </Location> PerlModule ModPerl::PerlRun |