diff options
Diffstat (limited to 'modules/apache/templates/vhost_base.conf')
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf index 84c8f918..c49b36f5 100644 --- a/modules/apache/templates/vhost_base.conf +++ b/modules/apache/templates/vhost_base.conf @@ -5,18 +5,18 @@ else end -%> -<VirtualHost *:<%= port %>> +<VirtualHost *:<%= @port %>> <%- if use_ssl then -%> <%= scope.function_template(["apache/vhost_ssl.conf"]) %> <%- end -%> - ServerName <%= real_vhost %> + ServerName <%= @real_vhost %> <%- server_aliases.each do |key| -%> - ServerAlias <%= key %> + ServerAlias <%= @key %> <%- end -%> - DocumentRoot <%= location %> + DocumentRoot <%= @location %> - CustomLog <%= real_access_logfile %> combined - ErrorLog <%= real_error_logfile %> + CustomLog <%= @real_access_logfile %> combined + ErrorLog <%= @real_error_logfile %> <%- if enable_public_html -%> #TODO add the rest @@ -28,14 +28,14 @@ end <%- end -%> <%- aliases.keys.sort {|a,b| a.size <=> b.size }.reverse.each do |key| -%> - Alias <%= key %> <%= aliases[key] %> + Alias <%= @key %> <%= @aliases[key] %> <%- end -%> - <%= content %> + <%= @content %> <%- if options.length > 0 -%> - <Directory <%= location %>> - Options <%= options.join(" ") %> + <Directory <%= @location %>> + Options <%= @options.join(" ") %> </Directory> <%- end -%> |