From: Tom Hughes <tom@compton.nu>
Date: Mon, 28 Mar 2016 16:38:11 +0000 (+0100)
Subject: Revert "Allow dev users to sudo cat their apache logs"
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/94e7f96b74c525574243c63ef64184d93cceac16?ds=sidebyside

Revert "Allow dev users to sudo cat their apache logs"

This reverts commit 295847cabea40add72f44bf44f81adc6a8fb6dfa.
---

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 849830bc2..b5b864ffc 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -134,14 +134,6 @@ 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 0440
-    variables :user => name
-  end
 end
 
 if node[:postgresql][:clusters][:"9.3/main"]
diff --git a/cookbooks/dev/templates/default/sudoers.user.erb b/cookbooks/dev/templates/default/sudoers.user.erb
deleted file mode 100644
index bc432eeaf..000000000
--- a/cookbooks/dev/templates/default/sudoers.user.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-<%= @user %> ALL=(ALL) NOPASSWD: /bin/cat /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log
-<%= @user %> ALL=(ALL) NOPASSWD: /bin/cat /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log.1
-<%= @user %> ALL=(ALL) NOPASSWD: /bin/cat /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
-<%= @user %> ALL=(ALL) NOPASSWD: /bin/cat /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log.1