Allow basic auth to be optional in apache conf

README.md

@@ -75,6 +75,9 @@ Attributes
 * jenkins[:http_proxy][:host_name] - primary vhost name for the HTTP proxy to respond to (`node[:fqdn]` by default)
 * jenkins[:http_proxy][:host_aliases] - optional list of other host aliases to respond to (empty by default)
 * jenkins[:http_proxy][:client_max_body_size] - max client upload size ("1024m" by default, nginx only)
+* jenkins[:http_proxy][:basic_auth_username],
+* jenkins[:http_proxy][:basic_auth_password] - HTTP Basic Auth username/password. Defaults to jenkins/jenkins.
+Setting either one to an empty string will disable basic auth.
 
 Usage
 =====

recipes/proxy_apache2.rb

@@ -34,26 +34,29 @@
 
 host_name = node[:jenkins][:http_proxy][:host_name] || node[:fqdn]
 
+skip_basic_auth = node['jenkins']['http_proxy']['basic_auth_username'].empty? || node['jenkins']['http_proxy']['basic_auth_password'].empty?
+
 template "#{node.apache.dir}/htpasswd" do
   variables( :username => node.jenkins.http_proxy.basic_auth_username,
              :password => node.jenkins.http_proxy.basic_auth_password)
   owner node.apache.user
   group node.apache.user
   mode 0600
+  not_if { skip_basic_auth }
 end
 
 template "#{node[:apache][:dir]}/sites-available/jenkins" do
   source      "apache_jenkins.erb"
   owner       'root'
   group       'root'
   mode        '0644'
-  variables(
+  variables({
     :host_name        => host_name,
     :host_aliases     => node[:jenkins][:http_proxy][:host_aliases],
     :listen_ports     => node[:jenkins][:http_proxy][:listen_ports],
-    :www_redirect     => www_redirect
-  )
-
+    :www_redirect     => www_redirect,
+    :skip_basic_auth  => skip_basic_auth,
+  })
   if File.exists?("#{node[:apache][:dir]}/sites-enabled/jenkins")
     notifies  :restart, 'service[apache2]'
   end

templates/default/apache_jenkins.erb

@@ -29,6 +29,7 @@
   ProxyPreserveHost on
   ProxyPass         /  http://localhost:<%= node[:jenkins][:server][:port] %>/
   ProxyPassReverse  /  http://localhost:<%= node[:jenkins][:server][:port] %>/
+<% unless @skip_basic_auth -%>
 
   <Location />
     AuthType basic
@@ -37,4 +38,5 @@
     AuthUserFile <%= File.join(node.apache.dir, "htpasswd") %>
     require valid-user
   </Location>
+<% end -%>
 </VirtualHost>