capistrano-django 4.0.1 → 4.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/capistrano/django.rb +25 -27
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 263c3e3468d70f4c74569b15cfd5bc797628f0c287913a0b976786254a7f9d5d
|
|
4
|
+
data.tar.gz: 9b40c0639dd80580b057fc09bb0b35b96a6d5f2692715be3fa533c2a3e12fde9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a28521ba208ef3cbf290d6d69d24d934e7af03057fcab1f20efb8c869c3dd1560c24abf7a787f7d9fc41a9e1726287e4ef742f0a85a6da95ec1364e7642aee9a
|
|
7
|
+
data.tar.gz: 58e63b60f4b6d34b8c3b2d5a8623346c2bc9f8d9f8d8ceba94f9255c1cf97ef68bb2330a8e5b24739bfeed9282f1872114f839652e717e39a8f007c91c1094b9
|
data/lib/capistrano/django.rb
CHANGED
|
@@ -151,7 +151,7 @@ namespace :django do
|
|
|
151
151
|
task :collectstatic do
|
|
152
152
|
if fetch(:create_s3_bucket)
|
|
153
153
|
invoke 's3:create_bucket'
|
|
154
|
-
on roles(:
|
|
154
|
+
on roles(:web) do
|
|
155
155
|
django("collectstatic", "-i *.coffee -i *.less -i node_modules/* -i bower_components/* --noinput --clear")
|
|
156
156
|
end
|
|
157
157
|
else
|
|
@@ -263,32 +263,30 @@ namespace :s3 do
|
|
|
263
263
|
execute %Q|echo 'STATICFILES_STORAGE = "storages.backends.s3boto.S3BotoStorage"' >> #{settings_path}/#{fetch(:django_settings)}.py|
|
|
264
264
|
end
|
|
265
265
|
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
"
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
})
|
|
291
|
-
end
|
|
266
|
+
require 'fog'
|
|
267
|
+
storage = Fog::Storage.new({
|
|
268
|
+
aws_access_key_id: fetch(:aws_access_key),
|
|
269
|
+
aws_secret_access_key: fetch(:aws_secret_key),
|
|
270
|
+
provider: "AWS"
|
|
271
|
+
})
|
|
272
|
+
storage.put_bucket(bucket_name)
|
|
273
|
+
storage.put_bucket_policy(bucket_name, {
|
|
274
|
+
'Statement' => [{
|
|
275
|
+
'Sid' => 'AddPerm',
|
|
276
|
+
'Effect' => 'Allow',
|
|
277
|
+
'Principal' => '*',
|
|
278
|
+
'Action' => ['s3:GetObject'],
|
|
279
|
+
'Resource' => ["arn:aws:s3:::#{bucket_name}/*"]
|
|
280
|
+
}]
|
|
281
|
+
})
|
|
282
|
+
storage.put_bucket_cors(bucket_name, {
|
|
283
|
+
"CORSConfiguration" => [{
|
|
284
|
+
"AllowedOrigin" => ["*"],
|
|
285
|
+
"AllowedHeader" => ["*"],
|
|
286
|
+
"AllowedMethod" => ["GET"],
|
|
287
|
+
"MaxAgeSeconds" => 3000
|
|
288
|
+
}]
|
|
289
|
+
})
|
|
292
290
|
|
|
293
291
|
end
|
|
294
292
|
|