Merge branch 'master' into polls

config/deploy.rb

@@ -30,6 +30,7 @@ set :keep_releases, 5
 set :local_user, ENV['USER']
 
 set :delayed_job_workers, 2
+set :delayed_job_roles, :background
 
 set(:config_files, %w(
   log_rotation

config/deploy/preproduction.rb

@@ -6,5 +6,5 @@ set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :preproduction
 set :rails_env, :preproduction
 
-server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron)
+server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron background)
 server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)

config/deploy/production.rb

@@ -7,6 +7,6 @@ set :stage, :production
 set :rails_env, :production
 
 #server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
-server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron)
+server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background)
 server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer)
 server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer)

config/locales/settings.en.yml

@@ -34,3 +34,5 @@ en:
         voting_allowed: Voting on investment projects
     mailer_from_name: Origin email name
     mailer_from_address: Origin email address
+    meta_description: "Site description (SEO)"
+    meta_keywords: "Keywords (SEO)"

config/locales/settings.es.yml

@@ -34,3 +34,5 @@ es:
         voting_allowed: Votaciones sobre propuestas de inversión.
     mailer_from_name: Nombre email remitente
     mailer_from_address: Dirección email remitente
+    meta_description: "Descripción del sitio (SEO)"
+    meta_keywords: "Palabras clave (SEO)"