Merge pull request #48 from beardyjay/master - warvox - VoIP based wardialing tool, forked from rapid7/warvox.
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit e367620aeabc5bf63187b4c92c7c0588f1ebe6b4
(DIR) parent 1ba5b2dcbb3af0cfcc15f09515149c3293fe753d
(HTM) Author: HD Moore <x@hdm.io>
Date: Tue, 13 Sep 2016 12:24:02 -0500
Merge pull request #48 from beardyjay/master
Small fixes
Diffstat:
M app/assets/javascripts/dataTables_… | 2 +-
M app/views/projects/show.html.erb | 4 ----
M config/environments/production.rb | 99 ++++++++++++-------------------
3 files changed, 38 insertions(+), 67 deletions(-)
---
(DIR) diff --git a/app/assets/javascripts/dataTables_overrides.js b/app/assets/javascripts/dataTables_overrides.js
@@ -31,7 +31,7 @@ $.extend( $.fn.dataTableExt.oPagination, {
};
$(nPaging).addClass('pagination').append(
- '<ul>'+
+ '<ul class="pagination pagination">'+
'<li class="prev disabled"><a href="#">← '+oLang.sPrevious+'</a></li>'+
'<li class="next disabled"><a href="#">'+oLang.sNext+' → </a></li>'+
'</ul>'
(DIR) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
@@ -19,12 +19,8 @@
<div class="span2"><a href="<%= new_dialer_project_job_path(@project) %>" class="btn" rel="tooltip" title="Gather data by dialing a range of numbers"><i class="fa fa-phone"></i> <strong>Wardial</strong></a></div>
<% if @boxes[:answered][:cnt] > 0 %>
<div class="span2"><a href="<%= new_analyze_project_job_path(@project) %>" class="btn" rel="tooltip" title="Analyze call data to determine line types and frequencies"><i class="fa fa-cogs"></i> <strong>Analyze</strong></a></div>
- <div class="span2"><a href="#" class="btn" rel="tooltip" title="Look up meta-information about specific lines"><i class="fa fa-user"></i> <strong>Identify</strong></a></div>
- <div class="span2"><a href="#" class="btn" rel="tooltip" title="Signal analysis and other research tools"><i class="fa fa-star"></i> <strong>Research</strong></a></div>
<% else %>
<div class="span2"><a href="#" class="btn disabled" rel="tooltip" title="No call data is available to analyze"><i class="fa fa-cogs"></i> <strong>Analyze</strong></a></div>
- <div class="span2"><a href="#" class="btn" rel="tooltip" title="Look up meta-information about specific lines"><i class="fa fa-user"></i> <strong>Identify</strong></a></div>
- <div class="span2"><a href="#" class="btn disabled" rel="tooltip" title="No call data is available to research"><i class="fa fa-star"></i> <strong>Research</strong></a></div>
<% end %>
<div class="span2"> </div>
</div>
(DIR) diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -1,81 +1,56 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- # Code is not reloaded between requests.
- config.cache_classes = true
+ # In the development environment your application's code is reloaded on
+ # every request. This slows down response time but is perfect for development
+ # since you don't have to restart the web server when you make code changes.
+ config.cache_classes = false
- # Eager load code on boot. This eager loads most of Rails and
- # your application in memory, allowing both threaded web servers
- # and those relying on copy on write to perform better.
- # Rake tasks automatically ignore this option for performance.
- config.eager_load = true
+ # Do not eager load code on boot.
+ config.eager_load = false
- # Full error reports are disabled and caching is turned on.
- config.consider_all_requests_local = false
- config.action_controller.perform_caching = true
+ # Show full error reports and disable caching.
+ config.consider_all_requests_local = true
- # Disable serving static files from the `/public` folder by default since
- # Apache or NGINX already handles this.
- config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+ # Enable/disable caching. By default caching is disabled.
+ if Rails.root.join('tmp/caching-dev.txt').exist?
+ config.action_controller.perform_caching = true
- # Compress JavaScripts and CSS.
- config.assets.js_compressor = :uglifier
- # config.assets.css_compressor = :sass
+ config.cache_store = :memory_store
+ config.public_file_server.headers = {
+ 'Cache-Control' => 'public, max-age=172800'
+ }
+ else
+ config.action_controller.perform_caching = false
- # Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
-
- # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
- # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http://assets.example.com'
-
- # Specifies the header that your server uses for sending files.
- # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
-
- # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
-
- # Use the lowest log level to ensure availability of diagnostic information
- # when problems arise.
- config.log_level = :debug
-
- # Prepend all log lines with the following tags.
- config.log_tags = [ :request_id ]
+ config.cache_store = :null_store
+ end
- # Use a different cache store in production.
- # config.cache_store = :mem_cache_store
+ # Don't care if the mailer can't send.
+ config.action_mailer.raise_delivery_errors = false
- # Use a real queuing backend for Active Job (and separate queues per environment)
- # config.active_job.queue_adapter = :resque
- # config.active_job.queue_name_prefix = "barerails5app_#{Rails.env}"
config.action_mailer.perform_caching = false
- # Ignore bad email addresses and do not raise email delivery errors.
- # Set this to true and configure the email server for immediate delivery to raise delivery errors.
- # config.action_mailer.raise_delivery_errors = false
+ # Print deprecation notices to the Rails logger.
+ config.active_support.deprecation = :log
- # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
- # the I18n.default_locale when a translation cannot be found).
- config.i18n.fallbacks = true
+ # Raise an error on page load if there are pending migrations.
+ config.active_record.migration_error = :page_load
- # Send deprecation notices to registered listeners.
- config.active_support.deprecation = :notify
+ config.log_level = :debug
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
+ # Debug mode disables concatenation and preprocessing of assets.
+ # This option may cause significant delays in view rendering with a large
+ # number of complex assets.
+ config.assets.debug = false
- # Use a different logger for distributed setups.
- # require 'syslog/logger'
- # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+ # Suppress logger output for asset requests.
+ config.assets.quiet = true
- if ENV["RAILS_LOG_TO_STDOUT"].present?
- logger = ActiveSupport::Logger.new(STDOUT)
- logger.formatter = config.log_formatter
- config.logger = ActiveSupport::TaggedLogging.new(logger)
- end
+ # Raises error for missing translations
+ # config.action_view.raise_on_missing_translations = true
- # Do not dump schema after migrations.
- config.active_record.dump_schema_after_migration = false
+ # Use an evented file watcher to asynchronously detect changes in source code,
+ # routes, locales, etc. This feature depends on the listen gem.
+ # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
end