X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b950c1532294e17c9770e1441168bca268bd8313..eb1313a389c4d7f517b78a0dfbe0f81f2d9095a2:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 19539c9dc..8d0a86e53 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -64,6 +64,7 @@ apache_module "proxy" apache_module "proxy_fcgi" apache_module "rewrite" apache_module "wsgi" +apache_module "headers" gem_package "sqlite3" @@ -81,7 +82,7 @@ template "/etc/php5/fpm/pool.d/default.conf" do source "fpm-default.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 notifies :reload, "service[php5-fpm]" end @@ -96,7 +97,7 @@ template "/etc/phppgadmin/config.inc.php" do source "phppgadmin.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 end file "/etc/apache2/conf.d/phppgadmin" do @@ -123,7 +124,7 @@ search(:accounts, "*:*").each do |account| source "fpm.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :user => name, :port => port notifies :reload, "service[php5-fpm]" end @@ -133,6 +134,14 @@ search(:accounts, "*:*").each do |account| directory "#{user_home}/public_html" variables :user => name, :port => port end + + template "/etc/sudoers.d/#{name}" do + source "sudoers.user.erb" + owner "root" + group "root" + mode 0o440 + variables :user => name + end end if node[:postgresql][:clusters][:"9.3/main"] @@ -145,7 +154,7 @@ if node[:postgresql][:clusters][:"9.3/main"] source "cleanup-assets.erb" owner "root" group "root" - mode 0755 + mode 0o755 end node[:dev][:rails].each do |name, details| @@ -187,7 +196,7 @@ if node[:postgresql][:clusters][:"9.3/main"] source "rails.setup.rb.erb" owner "apis" group "apis" - mode 0644 + mode 0o644 variables :site => site_name notifies :run, "execute[#{rails_directory}]" end @@ -222,14 +231,14 @@ if node[:postgresql][:clusters][:"9.3/main"] directory "/srv/apis.dev.openstreetmap.org" do owner "apis" group "apis" - mode 0755 + mode 0o755 end template "/srv/apis.dev.openstreetmap.org/index.html" do source "apis.html.erb" owner "apis" group "apis" - mode 0644 + mode 0o644 end apache_site "apis.dev.openstreetmap.org" do