summaryrefslogtreecommitdiff
path: root/templates/vhosts/php_silverstripe/php_silverstripe.erb
diff options
context:
space:
mode:
Diffstat (limited to 'templates/vhosts/php_silverstripe/php_silverstripe.erb')
-rw-r--r--templates/vhosts/php_silverstripe/php_silverstripe.erb28
1 files changed, 4 insertions, 24 deletions
diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb
index 19f48d1..eaf944a 100644
--- a/templates/vhosts/php_silverstripe/php_silverstripe.erb
+++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb
@@ -44,12 +44,7 @@
Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
<%- end -%>
- <%- unless htpasswd_file.to_s == 'absent' then -%>
- AuthType Basic
- AuthName "Access fuer <%= servername %>"
- AuthUserFile <%= real_htpasswd_path %>
- require valid-user
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
php_admin_flag engine on
<%- unless php_default_charset.to_s == 'absent' then -%>
php_admin_value default_charset <%= php_default_charset %>
@@ -125,12 +120,7 @@
Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
<%- end -%>
- <%- unless htpasswd_file.to_s == 'absent' then -%>
- AuthType Basic
- AuthName "Access fuer <%= servername %>"
- AuthUserFile <%= real_htpasswd_path %>
- require valid-user
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
php_admin_flag engine on
<%- unless php_default_charset.to_s == 'absent' then -%>
php_admin_value default_charset <%= php_default_charset %>
@@ -223,12 +213,7 @@
Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
<%- end -%>
- <%- unless htpasswd_file.to_s == 'absent' then -%>
- AuthType Basic
- AuthName "Access fuer <%= servername %>"
- AuthUserFile <%= real_htpasswd_path %>
- require valid-user
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
# silverstripe .htaccess
<Files *.ss>
Order deny,allow
@@ -299,12 +284,7 @@
Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
<%- end -%>
- <%- unless htpasswd_file.to_s == 'absent' then -%>
- AuthType Basic
- AuthName "Access fuer <%= servername %>"
- AuthUserFile <%= real_htpasswd_path %>
- require valid-user
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
# silverstripe .htaccess
<Files *.ss>