properly integrate asset_sync

2 files changed, 29 insertions, 1 deletions

diff --git a/config/initializers/asset_sync.rb b/config/initializers/asset_sync.rb
new file mode 100644
index 000000000..227cde492
--- /dev/null
+++ b/config/initializers/asset_sync.rb
@@ -0,0 +1,28 @@
+
+if AppConfig.environment.assets.upload? && AppConfig.environment.s3.enable?
+  require 'asset_sync'
+  AssetSync.configure do |config|
+    config.enabled = true
+    
+    config.fog_provider = 'AWS'
+    config.aws_access_key_id = AppConfig.environment.s3.key.get
+    config.aws_secret_access_key = AppConfig.environment.s3.secret.get
+    config.fog_directory = AppConfig.environment.s3.bucket.get
+  
+    # Increase upload performance by configuring your region
+    config.fog_region = AppConfig.environment.s3.region.get
+    #
+    # Don't delete files from the store
+    # config.existing_remote_files = "keep"
+    #
+    # Automatically replace files with their equivalent gzip compressed version
+    # config.gzip_compression = true
+    #
+    # Use the Rails generated 'manifest.yml' file to produce the list of files to 
+    # upload instead of searching the assets directory.
+    # config.manifest = true
+    #
+    # Fail silently.  Useful for environments such as Heroku
+    # config.fail_silently = true
+  end
+end
diff --git a/config/initializers/static_assets.rb b/config/initializers/assets.rb
index d645ec958..246e2771e 100644
--- a/config/initializers/static_assets.rb
+++ b/config/initializers/assets.rb
@@ -3,6 +3,6 @@
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
-  config.serve_static_assets = AppConfig.environment.serve_static_assets?
+  config.serve_static_assets = AppConfig.environment.assets.serve?
   # config.static_cache_control = "public, max-age=3600" if AppConfig[:serve_static_assets].to_s == 'true'
 end