summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-04-19 16:53:53 +0200
committermh <mh@immerda.ch>2014-04-19 16:53:53 +0200
commitbc953036d453e57383dcd7aad33c203104061ceb (patch)
tree22f0ada15d0924aaf64db4c90b738eac2866f95a /templates
parent1ed74a3beb4498ed1566a94c49da3fb4c57cef0e (diff)
remove unnecessary new lines
Diffstat (limited to 'templates')
-rw-r--r--templates/vhosts/gitweb/partial.erb1
-rw-r--r--templates/vhosts/itk_plus/partial.erb1
-rw-r--r--templates/vhosts/perl/partial.erb1
-rw-r--r--templates/vhosts/php/partial.erb2
-rw-r--r--templates/vhosts/php_drupal/partial.erb3
-rw-r--r--templates/vhosts/php_gallery2/partial.erb2
-rw-r--r--templates/vhosts/php_joomla/partial.erb2
-rw-r--r--templates/vhosts/static/partial.erb1
8 files changed, 0 insertions, 13 deletions
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
<Files gitweb.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']) %>
</Directory>
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 @@
<Directory "<%= @documentroot %>/">
<%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
-
<%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
</Directory>
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 @@
<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']) %>
</Directory>
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 @@
<Directory "<%= @documentroot %>/">
<%= 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.
<FilesMatch "\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template)$">
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 @@
<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']) %>
# 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 @@
<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
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 @@
<Directory "<%= @documentroot %>/">
<%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
-
<%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
</Directory>