Fix S3 defaults.

feedbin · Feb 11, 2020 · 408dd60 · 408dd60 · angristan · Feb 11, 2020
1 parent 686f6d8
commit 408dd60
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -2478,6 +2478,7 @@ $characters: a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7
     overflow-y: auto;
     overflow-x: hidden;
     -webkit-overflow-scrolling: touch;
+
     transition: transform .15s ease-in;
     @include background-color($color-base);
     flex: 1;
@@ -5520,7 +5521,7 @@ Settings
         flex: 1;
         align-items: center;
         > :first-child {
-            margin-right: 64px
+            margin-right: 32px
         }
         .last-control {
             display: flex;
@@ -6471,9 +6472,6 @@ label.text-field {
         td:last-child {
             padding-right: 0 !important;
             text-align: right;
-            @media (max-width: $small-breakpoint) {
-                padding-right: 15px !important;
-            }
         }
         td input {
             margin: 0;

diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
@@ -1,14 +1,15 @@
 if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
   CarrierWave.configure do |config|
-    config.fog_credentials = {
+    options = {
       provider: "AWS",
       aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"],
       aws_secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"],
-      region: ENV["AWS_S3_REGION"] || "us-east-1",
-      host: ENV["AWS_S3_HOST"] || "s3.amazonaws.com",
-      endpoint: ENV["AWS_S3_ENDPOINT"] || nil,
-      path_style: ENV["AWS_S3_PATH_STYLE"] || false,
     }
+    options[:region] = ENV["AWS_S3_REGION"] if ENV["AWS_S3_REGION"]
+    options[:host] = ENV["AWS_S3_HOST"] if ENV["AWS_S3_HOST"]
+    options[:endpoint] = ENV["AWS_S3_ENDPOINT"] if ENV["AWS_S3_ENDPOINT"]
+    options[:path_style] = ENV["AWS_S3_PATH_STYLE"] if ENV["AWS_S3_PATH_STYLE"]
+    config.fog_credentials = options
     config.fog_directory = ENV["AWS_S3_BUCKET"]
     config.max_file_size = 5.megabytes
   end

diff --git a/config/initializers/s3.rb b/config/initializers/s3.rb
@@ -1,14 +1,15 @@
 if ENV["AWS_ACCESS_KEY_ID"]
   S3_POOL = ConnectionPool.new(size: 10, timeout: 5) {
-    Fog::Storage.new(
+    options = {
       provider: "AWS",
       aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"],
       aws_secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"],
-      region: ENV["AWS_S3_REGION"] || "us-east-1",
-      host: ENV["AWS_S3_HOST"] || "s3.amazonaws.com",
-      endpoint: ENV["AWS_S3_ENDPOINT"] || nil,
-      path_style: ENV["AWS_S3_PATH_STYLE"] || false,
       persistent: true,
-    )
+    }
+    options[:region] = ENV["AWS_S3_REGION"] if ENV["AWS_S3_REGION"]
+    options[:host] = ENV["AWS_S3_HOST"] if ENV["AWS_S3_HOST"]
+    options[:endpoint] = ENV["AWS_S3_ENDPOINT"] if ENV["AWS_S3_ENDPOINT"]
+    options[:path_style] = ENV["AWS_S3_PATH_STYLE"] if ENV["AWS_S3_PATH_STYLE"]
+    Fog::Storage.new(options)
   }
 end