lib/fulmar/infrastructure/service/transfer/rsync.rb in fulmar-1.4.0 vs lib/fulmar/infrastructure/service/transfer/rsync.rb in fulmar-1.4.1
- old
+ new
@@ -16,11 +16,13 @@
delete: true,
direction: 'up'
}
}
+ # @param [Fulmar::Domain::Service::ConfigurationService] config
def initialize(config)
- @config = DEFAULT_CONFIG.deep_merge(config)
+ @config = config
+ @config.merge(DEFAULT_CONFIG)
if @config[:rsync][:exclude_file].blank? && File.exist?(@config[:local_path] + '/.rsyncignore')
@config[:rsync][:exclude_file] = @config[:local_path] + '/.rsyncignore'
end