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/perl/partial.erb | |
| parent | ffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff) | |
| parent | 8074127b8d8913314c90c3fe6131d078a858f7b6 (diff) | |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'templates/vhosts/perl/partial.erb')
| -rw-r--r-- | templates/vhosts/perl/partial.erb | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/templates/vhosts/perl/partial.erb b/templates/vhosts/perl/partial.erb index a8c30c3..8c1f0a5 100644 --- a/templates/vhosts/perl/partial.erb +++ b/templates/vhosts/perl/partial.erb @@ -1,15 +1,14 @@ - <Directory "<%= documentroot %>/"> + <Directory "<%= @documentroot %>/"> <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> - </Directory> + </Directory> - <% unless htpasswd_file.to_s == 'absent' -%> - <Directory "<%= cgi_binpath %>/"> - AuthType Basic - AuthName "Access fuer <%= servername %>" - AuthUserFile <%= real_htpasswd_path %> - require valid-user - </Directory> - <% end -%> - ScriptAlias /cgi-bin/ <%= cgi_binpath %>/ +<% unless @htpasswd_file.to_s == 'absent' -%> + <Directory "<%= @cgi_binpath %>/"> + AuthType Basic + AuthName "Access fuer <%= @servername %>" + AuthUserFile <%= @real_htpasswd_path %> + require valid-user + </Directory> +<% end -%> + ScriptAlias /cgi-bin/ <%= @cgi_binpath %>/ |