Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit b044f22

Browse files
committed
Merge pull request #45 from legal90/fix-http-auth
Fixed HTTP authentication
2 parents f691198 + 95f5c27 commit b044f22

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

recipes/apache2.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@
66
include_recipe 'apache2::mod_proxy_http'
77
include_recipe 'apache2::mod_ssl'
88

9+
# Disable mod_auth_basic because it isn't supported in Stash 2.10 and later
10+
apache_module "auth_basic" do
11+
enable false
12+
end
13+
914
web_app node['stash']['apache2']['virtual_host_name']

templates/default/web_app.conf.erb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313
<% end -%>
1414
<% end -%>
1515
DocumentRoot <%= node['stash']['install_path'] %>
16-
16+
1717
CustomLog <%= node['stash']['apache2']['access_log'].empty? ? node['apache']['log_dir']+"/stash-access.log" : node['stash']['apache2']['access_log'] %> combined
1818
ErrorLog <%= node['stash']['apache2']['error_log'].empty? ? node['apache']['log_dir']+"/stash-error.log" : node['stash']['apache2']['error_log'] %>
1919
LogLevel warn
2020

21-
# Make sure we disable/prevent basic authentication attempts since Stash 2.1+ can't handle them
22-
RequestHeader unset Authorization
23-
2421
<Proxy *>
2522
<% if node['apache'] && node['apache']['version'] == '2.4' %>
2623
Require all granted
@@ -49,9 +46,6 @@
4946
ErrorLog <%= node['stash']['apache2']['ssl']['error_log'].empty? ? node['apache']['log_dir']+"/stash-ssl-error.log" : node['stash']['apache2']['ssl']['error_log'] %>
5047
LogLevel warn
5148

52-
# Make sure we disable/prevent basic authentication attempts since Stash 2.1+ can't handle them
53-
RequestHeader unset Authorization
54-
5549
<Proxy *>
5650
<% if node['apache'] && node['apache']['version'] == '2.4' %>
5751
Require all granted

0 commit comments

Comments
 (0)