:timeout => 30,
:event => {
:server_limit => 32,
- :max_clients => 800,
+ :max_request_workers => 800,
:threads_per_child => 50,
- :max_requests_per_child => 10000
+ :max_connections_per_child => 10000
}
},
+ :apt => {
+ :sources => ["postgresql"]
+ },
:dev => {
:rails => {
:master => {
- :repository => "git://git.openstreetmap.org/rails.git",
+ :repository => "https://git.openstreetmap.org/public/rails.git",
:revision => "master",
+ :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+ :cgimap_revision => "master",
:aliases => ["api06.dev.openstreetmap.org"]
},
:tomh => {
:repository => "git://github.com/tomhughes/openstreetmap-website.git",
:revision => "next"
},
- :owl => {
- :repository => "git://github.com/ppawel/openstreetmap-website.git",
- :revision => "owl-activity-tab"
- },
- :groups => {
- :repository => "git://github.com/osmlab/openstreetmap-website.git",
- :revision => "groups-sketch"
+ :rails6 => {
+ :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+ :revision => "rails6"
},
:comments => {
:repository => "git://github.com/ukasiu/openstreetmap-website.git",
:revision => "comments_list"
},
- :moderation => {
- :repository => "git://github.com/sbagroy986/openstreetmap-website.git",
- :revision => "moderation_queue"
- },
:locale => {
:repository => "git://github.com/tomhughes/openstreetmap-website.git",
:revision => "locale"
+ },
+ :upload => {
+ :repository => "https://git.openstreetmap.org/public/rails.git",
+ :revision => "master",
+ :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+ :cgimap_revision => "feature/bulk_upload"
}
}
},
:postgresql => {
- :versions => ["9.1", "9.3"],
+ :versions => ["9.1", "9.5"],
:settings => {
:defaults => {
:shared_buffers => "1GB",
"9.1" => {
:port => "5433"
},
- "9.3" => {
+ "9.5" => {
:port => "5432"
}
}