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

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 4ac28760f4c7879d59982595b91bd324a481d438..6c867f33db4d48bf4ef682577559195b2b0dfd32 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -128,13 +128,11 @@ default_attributes(
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "feature/bulk_upload"
       },
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "feature/bulk_upload"
       },

-      :oauth2 => {
+      :argon2 => {

         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",

-        :revision => "doorkeeper"
-      },
-      :rails61 => {
-        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails61"
+        :revision => "argon2",
+        :cgimap_repository => "https://github.com/mmd-osm/openstreetmap-cgimap.git",
+        :cgimap_revision => "feature/argon2"

       }
     }
   },
       }
     }
   },