diff options
author | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
commit | 36fd84c3d17355afa05b519764c37a3e45efc40d (patch) | |
tree | c6f5dbc4651875a147607c788b37c5c973573330 /templates/vhosts/php_joomla/partial.erb | |
parent | ffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff) | |
parent | 8074127b8d8913314c90c3fe6131d078a858f7b6 (diff) |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'templates/vhosts/php_joomla/partial.erb')
-rw-r--r-- | templates/vhosts/php_joomla/partial.erb | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/templates/vhosts/php_joomla/partial.erb b/templates/vhosts/php_joomla/partial.erb index 3046129..55445bf 100644 --- a/templates/vhosts/php_joomla/partial.erb +++ b/templates/vhosts/php_joomla/partial.erb @@ -1,32 +1,30 @@ - <Directory "<%= documentroot %>/"> + <Directory "<%= @documentroot %>/"> <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/php_settings.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> - Include include.d/joomla.inc - </Directory> - - <Directory "<%= documentroot %>/administrator/"> - RewriteEngine on + Include include.d/joomla.inc + </Directory> + + <Directory "<%= @documentroot %>/administrator/"> + RewriteEngine on - # Rewrite URLs to https that go for the admin area - RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$ - RewriteCond %{HTTPS} !=on - RewriteCond %{REQUEST_URI} (.*/administrator/.*) - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R] - </Directory> + # Rewrite URLs to https that go for the admin area + RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$ + RewriteCond %{HTTPS} !=on + RewriteCond %{REQUEST_URI} (.*/administrator/.*) + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R] + </Directory> - # Deny various directories that - # shouldn't be webaccessible - <Directory "<%= documentroot %>/tmp/"> - Deny From All - </Directory> - <Directory "<%= documentroot %>/logs/"> - Deny From All - </Directory> - <Directory "<%= documentroot %>/cli/"> - Deny From All - </Directory> + # Deny various directories that + # shouldn't be webaccessible + <Directory "<%= @documentroot %>/tmp/"> + Deny From All + </Directory> + <Directory "<%= @documentroot %>/logs/"> + Deny From All + </Directory> + <Directory "<%= @documentroot %>/cli/"> + Deny From All + </Directory> |