Merge remote-tracking branch 'github/pull/459'

[chef.git] / cookbooks / overpass / recipes / default.rb

diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index d807eab696c0e6e0a68ba6e13a42c3756a04922a..4ec94b895c299c89b695098fb5a8cb4c27274b60 100644 (file)
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -23,6 +23,7 @@ include_recipe "apache"
 
 username = "overpass"
 basedir = data_bag_item("accounts", username)["home"]
 
 username = "overpass"
 basedir = data_bag_item("accounts", username)["home"]

+web_passwords = data_bag_item("web", "passwords")

 
 %w[bin site diffs db src].each do |dirname|
   directory "#{basedir}/#{dirname}" do
 
 %w[bin site diffs db src].each do |dirname|
   directory "#{basedir}/#{dirname}" do


@@ -71,6 +72,22 @@ end
 
 ## Setup Apache
 
 
 ## Setup Apache
 

+gem_package "rotp"
+
+directory "#{basedir}/apache" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+template "#{basedir}/apache/totp-filter" do
+  source "totp-filter.erb"
+  owner "root"
+  group "root"
+  mode "755"
+  variables :totp_key => web_passwords["totp_key"]
+end
+

 ssl_certificate node[:fqdn] do
   domains [node[:fqdn],
            node[:overpass][:fqdn]]
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn],
            node[:overpass][:fqdn]]


@@ -79,6 +96,11 @@ end
 
 apache_module "cgi"
 apache_module "headers"
 
 apache_module "cgi"
 apache_module "headers"

+apache_module "rewrite"
+
+apache_site "default" do
+  action :disable
+end

 
 apache_site "#{node[:overpass][:fqdn]}" do
   template "apache.erb"
 
 apache_site "#{node[:overpass][:fqdn]}" do
   template "apache.erb"