capistrano-django 4.0.6 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3746531a431997c4a6b2ed5a77bf0d6b52d0e21e06e9ca1a8cd46afc3893319
-  data.tar.gz: 81341bad05e71d5c660c4eb0e9ba7294789a76451d21993e50df9628d4db8cbf
+  metadata.gz: aebef853e8826f938b9fc379d3e4778bac6c7a38347b53349f341634d9cad2ab
+  data.tar.gz: ad68b7d55e0d3b01ef51544d0f9a412d643b0626b266de0d863113229452703a
 SHA512:
-  metadata.gz: 6f30d30e87632b3406ca9888174cf61a92c93d8a1a8dddf2363b4cd2ecb3ed1c03527bd4a439e53588bb294d1fc9543b651572aa9699f515c11708330f69086a
-  data.tar.gz: 6367754db79a42e91d4ac4d27f04cf690be449e90a1e9f19f521441f6b1cf2aa467bbb4e24ebce9d73c855b001d55778154d4f956f4d5f77c1ffcf40d3e29f34
+  metadata.gz: 0e2344277c7c08acac3cc5834bc4eff74578ea8da2d396aaf2e8dd6f3888f5077741b173b9d44adc7b64a95956f10ab0d6776266469a92600868c18d3265dcc3
+  data.tar.gz: 25ed5fde3cb5614fb083c1298f36e91a99cc90b1d40845882838d207751be8667079f4d144cf54aa8839cc63a5433e11180b1a030eb89251f60366502c220acc

data/lib/capistrano/django.rb

@@ -264,54 +264,59 @@ namespace :s3 do
       execute %Q|echo 'STATICFILES_STORAGE = "storages.backends.s3boto.S3BotoStorage"' >> #{settings_path}/#{fetch(:django_settings)}.py|
     end
 
-    require 'aws-sdk-s3'
-    require 'aws-sdk-core'
-    require 'json'
-
-    s3 = Aws::S3::Client.new :credentials => Aws::Credentials.new(fetch(:aws_access_key), fetch(:aws_secret_key))
-    s3.create_bucket({:bucket => bucket_name})
-    s3.put_bucket_ownership_controls({
-      :bucket => bucket_name,
-      :ownership_controls => {
-        :rules => [{
-          :object_ownership => :BucketOwnerPreferred
-        }]
-      }
-    })
-
-    s3.put_public_access_block({
-      :bucket => bucket_name,
-      :public_access_block_configuration => {
-        :ignore_public_acls => false,
-        :block_public_acls => false,
-        :block_public_policy => false,
-        :restrict_public_buckets => false
-      }
-    })
-
-    s3.put_bucket_policy({
-      :bucket => bucket_name,
-      :policy => {
-        :Statement => [{
-          :Effect => "Allow",
-          :Action => ["s3:GetObject"],
-          :Principal => "*",
-          :Resource => ["arn:aws:s3:::#{bucket_name}/*"
-        ]}
-      ]}.to_json
-    })
-
-    s3.put_bucket_cors({
-      :bucket => bucket_name,
-      :cors_configuration => {
-        :cors_rules => [{
-          :allowed_origins => ['*'],
-          :allowed_methods => ['GET'],
-          :allowed_headers => ['*'],
-          :max_age_seconds => 3000
-        }]
-      }
-    })
+    on roles(:web) do
+      require 'aws-sdk-s3'
+      require 'aws-sdk-core'
+      require 'json'
+
+      s3 = Aws::S3::Client.new({
+        :region => 'us-east-1',
+        :credentials => Aws::Credentials.new(fetch(:aws_access_key), fetch(:aws_secret_key))
+      })
+      s3.create_bucket({:bucket => bucket_name})
+      s3.put_bucket_ownership_controls({
+        :bucket => bucket_name,
+        :ownership_controls => {
+          :rules => [{
+            :object_ownership => :ObjectWriter
+          }]
+        }
+      })
+
+      s3.put_public_access_block({
+        :bucket => bucket_name,
+        :public_access_block_configuration => {
+          :ignore_public_acls => false,
+          :block_public_acls => false,
+          :block_public_policy => false,
+          :restrict_public_buckets => false
+        }
+      })
+
+      s3.put_bucket_policy({
+        :bucket => bucket_name,
+        :policy => {
+          :Statement => [{
+            :Effect => "Allow",
+            :Action => ["s3:GetObject"],
+            :Principal => "*",
+            :Resource => ["arn:aws:s3:::#{bucket_name}/*"
+          ]}
+        ]}.to_json
+      })
+
+      s3.put_bucket_cors({
+        :bucket => bucket_name,
+        :cors_configuration => {
+          :cors_rules => [{
+            :allowed_origins => ['*'],
+            :allowed_methods => ['GET'],
+            :allowed_headers => ['*'],
+            :max_age_seconds => 3000
+          }]
+        }
+      })
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-django
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.8
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano