migrate authentication to partials

1 files changed, 2 insertions, 14 deletions

diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb
index 05760d6..db5f102 100644
--- a/templates/vhosts/static/static.erb
+++ b/templates/vhosts/static/static.erb
@@ -26,12 +26,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') %>
     </Directory>
     <%- end -%>
 
@@ -64,21 +59,14 @@
 
     Header add Strict-Transport-Security "max-age=15768000"
 
-    <%- if options.to_s != 'absent' or htpasswd_file.to_s != 'absent' then -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
         Options <%= options %><%- 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') %>
     </Directory>
-    <%- end %>
 
 <%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>