diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2017-04-17 01:23:20 +0200 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2017-04-17 01:23:20 +0200 |
| commit | bcda278c2ab74795857cf9bcb9184268e8a28923 (patch) | |
| tree | 133434d17974f1b713846cde5f70cadbc030d5ac | |
| parent | 906ceed124713a5457c81235bb6ad423ba81d8a1 (diff) | |
| download | puppet-bcda278c2ab74795857cf9bcb9184268e8a28923.tar puppet-bcda278c2ab74795857cf9bcb9184268e8a28923.tar.gz puppet-bcda278c2ab74795857cf9bcb9184268e8a28923.tar.bz2 puppet-bcda278c2ab74795857cf9bcb9184268e8a28923.tar.xz puppet-bcda278c2ab74795857cf9bcb9184268e8a28923.zip | |
Allow to not use Location directive in apache ( but keep past use by default)
| -rw-r--r-- | modules/apache/manifests/vhost/base.pp | 3 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 2 | ||||
| -rwxr-xr-x | modules/bugzilla/manifests/init.pp | 1 | ||||
| -rw-r--r-- | modules/bugzilla/templates/vhost.conf | 12 |
4 files changed, 17 insertions, 1 deletions
diff --git a/modules/apache/manifests/vhost/base.pp b/modules/apache/manifests/vhost/base.pp index 1ddc00cc..27a19998 100644 --- a/modules/apache/manifests/vhost/base.pp +++ b/modules/apache/manifests/vhost/base.pp @@ -7,7 +7,8 @@ define apache::vhost::base ($content = '', $access_logfile = false, $error_logfile = false, $options = [], - $enable_public_html = false) { + $enable_public_html = false, + $enable_location = true) { include apache::base $httpd_logdir = '/var/log/httpd' $filename = "${name}.conf" diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf index c6feade5..84c8f918 100644 --- a/modules/apache/templates/vhost_base.conf +++ b/modules/apache/templates/vhost_base.conf @@ -39,6 +39,7 @@ end </Directory> <%- end -%> +<%- if enable_location -%> <Location /> <IfModule mod_authz_core.c> Require all granted @@ -47,5 +48,6 @@ end Allow from all </IfModule> </Location> +<%- end -%> </VirtualHost> diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp index 3e36fb42..373187d7 100755 --- a/modules/bugzilla/manifests/init.pp +++ b/modules/bugzilla/manifests/init.pp @@ -61,6 +61,7 @@ class bugzilla { use_ssl => true, location => $vhost_root, vhost => $bugs_vhost, + enable_location => false, } git::snapshot { $bugzilla_location: diff --git a/modules/bugzilla/templates/vhost.conf b/modules/bugzilla/templates/vhost.conf index 79eab9fb..b320285e 100644 --- a/modules/bugzilla/templates/vhost.conf +++ b/modules/bugzilla/templates/vhost.conf @@ -1,2 +1,14 @@ RewriteEngine On RewriteRule ^/([0-9]+)$ /show_bug.cgi?id=$1 [R=301,L] + + <Directory /usr/share> + Require all granted + </Directory> + + + <Directory /usr/share/bugzilla> + AllowOverride all + AddHandler cgi-script .cgi + Options +ExecCGI +FollowSymLinks + DirectoryIndex index.cgi index.html + </Directory> |