From bc953036d453e57383dcd7aad33c203104061ceb Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 19 Apr 2014 16:53:53 +0200 Subject: remove unnecessary new lines --- templates/vhosts/gitweb/partial.erb | 1 - templates/vhosts/itk_plus/partial.erb | 1 - templates/vhosts/perl/partial.erb | 1 - templates/vhosts/php/partial.erb | 2 -- templates/vhosts/php_drupal/partial.erb | 3 --- templates/vhosts/php_gallery2/partial.erb | 2 -- templates/vhosts/php_joomla/partial.erb | 2 -- templates/vhosts/static/partial.erb | 1 - 8 files changed, 13 deletions(-) (limited to 'templates') diff --git a/templates/vhosts/gitweb/partial.erb b/templates/vhosts/gitweb/partial.erb index d7765bf..a8475f6 100644 --- a/templates/vhosts/gitweb/partial.erb +++ b/templates/vhosts/gitweb/partial.erb @@ -4,7 +4,6 @@ <% if @options.to_s != 'absent' || @do_includes.to_s == 'true'-%> Options <% unless @options.to_s == 'absent' -%><%= @options %><% end -%><% if @do_includes.to_s == 'true' && !@options.include?('+Includes') -%> +Includes<% end -%><% unless @options.include?('+ExecCGI') -%> +ExecCGI<% end -%> <% end -%> - AddHandler cgi-script .cgi Options ExecCGI FollowSymLinks diff --git a/templates/vhosts/itk_plus/partial.erb b/templates/vhosts/itk_plus/partial.erb index 78e8d27..df04543 100644 --- a/templates/vhosts/itk_plus/partial.erb +++ b/templates/vhosts/itk_plus/partial.erb @@ -23,7 +23,6 @@ AllowOverride <%= @allow_override %> <% if @options.to_s != 'absent' || @do_includes.to_s == 'true' -%> Options <% unless @options.to_s == 'absent' -%><%= @options %><% end -%><% if @do_includes.to_s == 'true' && !@options.include?('+Includes') -%> +Includes<% end -%> - <% end -%> <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> diff --git a/templates/vhosts/perl/partial.erb b/templates/vhosts/perl/partial.erb index 7ed3e71..8c1f0a5 100644 --- a/templates/vhosts/perl/partial.erb +++ b/templates/vhosts/perl/partial.erb @@ -1,6 +1,5 @@ /"> <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> diff --git a/templates/vhosts/php/partial.erb b/templates/vhosts/php/partial.erb index 82df269..c19ae7b 100644 --- a/templates/vhosts/php/partial.erb +++ b/templates/vhosts/php/partial.erb @@ -1,7 +1,5 @@ /"> <%= 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']) %> diff --git a/templates/vhosts/php_drupal/partial.erb b/templates/vhosts/php_drupal/partial.erb index 2c5f562..316942f 100644 --- a/templates/vhosts/php_drupal/partial.erb +++ b/templates/vhosts/php_drupal/partial.erb @@ -1,10 +1,7 @@ /"> <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/php_settings.erb']) %> - # Protect files and directories from prying eyes. Order allow,deny diff --git a/templates/vhosts/php_gallery2/partial.erb b/templates/vhosts/php_gallery2/partial.erb index 000f969..218c0e7 100644 --- a/templates/vhosts/php_gallery2/partial.erb +++ b/templates/vhosts/php_gallery2/partial.erb @@ -1,8 +1,6 @@ /"> <%= 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']) %> # Always rewrite login's diff --git a/templates/vhosts/php_joomla/partial.erb b/templates/vhosts/php_joomla/partial.erb index 5a0f720..55445bf 100644 --- a/templates/vhosts/php_joomla/partial.erb +++ b/templates/vhosts/php_joomla/partial.erb @@ -1,8 +1,6 @@ /"> <%= 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 diff --git a/templates/vhosts/static/partial.erb b/templates/vhosts/static/partial.erb index ae8743f..dc6f11c 100644 --- a/templates/vhosts/static/partial.erb +++ b/templates/vhosts/static/partial.erb @@ -1,5 +1,4 @@ /"> <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> -- cgit v1.2.3