Revert "Allow dev users to sudo cat their apache logs"
authorTom Hughes <tom@compton.nu>
Mon, 28 Mar 2016 16:38:11 +0000 (17:38 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 28 Mar 2016 16:38:11 +0000 (17:38 +0100)
This reverts commit 295847cabea40add72f44bf44f81adc6a8fb6dfa.

cookbooks/dev/recipes/default.rb
cookbooks/dev/templates/default/sudoers.user.erb [deleted file]

index 849830bc24a9876146c4315ec44b44feaf870023..b5b864ffc633d255e8613fa58f16c75c7a23b811 100644 (file)
@@ -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 (file)
index bc432ee..0000000
+++ /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