Revert "community: Fix CSRF issue with monkey patch fix"

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 65e393b076d2dc9f61e27e6fb11373975d1698d8..f85849e888b70116b1a02cd232e55a273664316d 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -4,76 +4,79 @@ description "Role applied to all development servers"
 default_attributes(
   :accounts => {
     :users => {
 default_attributes(
   :accounts => {
     :users => {

-      :edgemaster => { :status => :administrator },
-      :emacsen => { :status => :user },
-      :twain => { :status => :user },
-      :bretth => { :status => :user },
-      :richard => { :status => :user },
-      :shaunmcdonald => { :status => :user },
-      :random => { :status => :user },
-      :steve8 => { :status => :user },
+      :ant => { :status => :user },
+      :antonkh => { :status => :user },
+      :apmon => { :status => :user },

       :blackadder => { :status => :user },
       :blackadder => { :status => :user },

-      :timsc => { :status => :user },

       :bobkare => { :status => :user },
       :bobkare => { :status => :user },

+      :bretth => { :status => :user },
+      :bsupnik => { :status => :user },
+      :chippy => { :status => :user },
+      :cobra => { :status => :user },
+      :contrapunctus => { :status => :user },
+      :csmale => { :status => :user },
+      :dan => { :status => :user },

       :daveh => { :status => :user },
       :daveh => { :status => :user },

-      :gravitystorm => { :status => :user },
-      :fred => { :status => :user },
-      :nick => { :status => :user },
+      :davidearl => { :status => :user },

       :deelkar => { :status => :user },
       :deelkar => { :status => :user },

-      :simone => { :status => :user },
-      :mitjak => { :status => :user },
+      :derick => { :status => :user },
+      :dmlu => { :status => :user },
+      :dodobas => { :status => :user },
+      :edgemaster => { :status => :administrator },
+      :emacsen => { :status => :user },
+      :enelson => { :status => :user },
+      :fred => { :status => :user },
+      :gmoncrieff => { :status => :user },
+      :gravitystorm => { :status => :user },
+      :gregory => { :status => :user },
+      :gregrs => { :status => :user },
+      :harrywood => { :status => :user },

       :htonl => { :status => :user },
       :htonl => { :status => :user },

-      :russ => { :status => :user },
-      :merio => { :status => :user },
-      :chippy => { :status => :user },
+      :jeslop => { :status => :user },
+      :jfire => { :status => :user },
+      :jgc => { :status => :user },

       :joerichards => { :status => :user },
       :joerichards => { :status => :user },

-      :pafciu17 => { :status => :user },
-      :ojw => { :status => :user },
-      :harrywood => { :status => :user },
-      :yellowbkpk => { :status => :user },
-      :apmon => { :status => :user },
-      :mackerski => { :status => :user },
+      :joshd => { :status => :user },

       :ldp => { :status => :user },
       :ldp => { :status => :user },

+      :lfrancke => { :status => :user },
+      :ligfietser => { :status => :user },
+      :lonvia => { :status => :user },
+      :maba => { :status => :user },
+      :mackerski => { :status => :user },
+      :malenki => { :status => :user },

       :mdaines => { :status => :user },
       :mdaines => { :status => :user },

-      :dan => { :status => :user },
-      :ris => { :status => :user },
+      :merio => { :status => :user },
+      :mhohmann => { :status => :user },
+      :milliams => { :status => :user },
+      :mitjak => { :status => :user },
+      :msbarry => { :status => :user },
+      :mvexel => { :status => :user },
+      :nick => { :status => :user },
+      :nicolas17 => { :status => :user },

       :nroets => { :status => :user },
       :nroets => { :status => :user },

+      :ojw => { :status => :user },

       :ollie => { :status => :user },
       :ollie => { :status => :user },

-      :mvexel => { :status => :user },
-      :tomchance => { :status => :user },
-      :lfrancke => { :status => :user },
-      :davidearl => { :status => :user },
-      :rweait => { :status => :user },
-      :ant => { :status => :user },
-      :milliams => { :status => :user },
+      :pafciu17 => { :status => :user },

       :pierzen => { :status => :user },
       :pierzen => { :status => :user },

-      :gregory => { :status => :user },
-      :bsupnik => { :status => :user },
-      :derick => { :status => :user },
-      :joshd => { :status => :user },
-      :maba => { :status => :user },

       :pnorman => { :status => :user },
       :pnorman => { :status => :user },

-      :csmale => { :status => :user },
-      :jgc => { :status => :user },
-      :cobra => { :status => :user },

       :ppawel => { :status => :user },
       :ppawel => { :status => :user },

+      :random => { :status => :user },
+      :richard => { :status => :user },
+      :rtnf => { :status => :user },
+      :ris => { :status => :user },
+      :russ => { :status => :user },
+      :rweait => { :status => :user },
+      :shaunmcdonald => { :status => :user },

       :simon04 => { :status => :user },
       :simon04 => { :status => :user },

-      :jeslop => { :status => :user },
-      :jfire => { :status => :user },
-      :malenki => { :status => :user },
-      :lonvia => { :status => :user },
-      :nicolas17 => { :status => :user },
-      :zverik => { :status => :user },
-      :dodobas => { :status => :user },
-      :mhohmann => { :status => :user },
-      :enelson => { :status => :user },
-      :gregrs => { :status => :user },
+      :simone => { :status => :user },

       :stereo => { :status => :user },
       :stereo => { :status => :user },

-      :dmlu => { :status => :user },
-      :antonkh => { :status => :user },
-      :gmoncrieff => { :status => :user },
+      :steve8 => { :status => :user },
+      :timsc => { :status => :user },
+      :tomchance => { :status => :user },
+      :twain => { :status => :user },
+      :yellowbkpk => { :status => :user },

       :zander => { :status => :user },
       :zander => { :status => :user },

-      :msbarry => { :status => :user },
+      :zverik => { :status => :user },

       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]


@@ -119,10 +122,7 @@ default_attributes(
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",

-        :cgimap_revision => "master",
-        :cgimap_options => {
-          :ratelimit_upload => true
-        }
+        :cgimap_revision => "master"

       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",
       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",