Skip to content
Snippets Groups Projects
Commit cf775df3 authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Allow override instead

parent 45042f9c
No related branches found
No related tags found
1 merge request!2Merge till Production
...@@ -57,6 +57,7 @@ class skadereg { ...@@ -57,6 +57,7 @@ class skadereg {
class { '::apache::mod::php': class { '::apache::mod::php':
package_name => 'php55-php' package_name => 'php55-php'
} }
include ::apache::mod::rewrite
package { 'php55-php-pdo': package { 'php55-php-pdo':
ensure => installed; ensure => installed;
...@@ -88,37 +89,21 @@ class skadereg { ...@@ -88,37 +89,21 @@ class skadereg {
} }
apache::vhost { "${::fqdn}:443": apache::vhost { "${::fqdn}:443":
servername => $::fqdn, servername => $::fqdn,
port => '443', port => '443',
ssl => true, ssl => true,
# ssl_cert => $cert, # ssl_cert => $cert,
# ssl_chain => $chain, # ssl_chain => $chain,
# ssl_key => $key, # ssl_key => $key,
headers => ['Set Strict-Transport-Security "max-age=31536000"',], headers => ['Set Strict-Transport-Security "max-age=31536000"',],
docroot => '/var/www/skadereg/public', docroot => '/var/www/skadereg/public',
proxy_preserve_host => true, directories => [
allow_encoded_slashes => 'on',
rewrites => [
{ {
'rewrite_cond' => [ path => '/var/www/skadereg/public',
'%{REQUEST_FILENAME} !-d', allow_override => [ 'ALL' ],
], directoryindex => 'index.php',
'rewrite_rule' => [ '^(.*)/$ /$1 [L,R=301]' ] }
}, ]
{
'rewrite_cond' => [
'%{HTTP:Authorization} ^(.*)'
],
'rewrite_rule' => [ '.* - [e=HTTP_AUTHORIZATION:%1]' ],
},
{
'rewrite_cond' => [
'%{REQUEST_FILENAME} !-d',
'%{REQUEST_FILENAME} !-f',
],
'rewrite_rule' => [ '^ index.php [L]' ],
},
],
} }
file { '/var/www/skadereg/': file { '/var/www/skadereg/':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment