clean up some old gunk

config.yml.travis

@@ -3,9 +3,6 @@ database_pool: 1
 session_secret: 's3cr3t'
 recaptcha_public_key: '1234'
 recaptcha_private_key: '5678'
-phantomjs_url:
-  - http://localhost:8910
-ip_hash_salt: "400$8$1$fc21863da5d531c1"
 email_unsubscribe_token: "somethingrandomderrrrp"
 paypal_api_username: derp
 paypal_api_password: ing

environment.rb

@@ -29,8 +29,6 @@ else
 end
 # :nocov:
 
-raise 'hash_ip_salt is required' unless $config['ip_hash_salt']
-
 DB = Sequel.connect $config['database'], sslmode: 'disable', max_connections: $config['database_pool']
 DB.extension :pagination
 DB.extension :auto_literal_strings

ext/phantomjs.rb

@@ -1,6 +0,0 @@
-module Phantomjs
-  # Workaround for vagrant bug.
-  def self.path
-    '/usr/local/bin/phantomjs'
-  end
-end

models/site.rb

@@ -387,11 +387,6 @@ class Site < Sequel::Model
     end
   end
 
-  def tip_amount
-    return '0.00' if tips_dataset.count == 0
-    '31.337'
-  end
-
   def username=(val)
     @redis_proxy_change = true
     @old_username = self.username

tests/environment.rb

@@ -2,9 +2,9 @@ ENV['RACK_ENV'] = 'test'
 raise 'Forget it.' if ENV['RACK_ENV'] == 'production'
 
 require 'coveralls'
-#require 'simplecov'
+require 'simplecov'
 require 'mock_redis'
-=begin
+
 SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
@@ -16,7 +16,7 @@ SimpleCov.start do
 end
 
 SimpleCov.command_name 'minitest'
-=end
+
 require 'rack_session_access'
 require './environment'
 require './app'

vagrant/phantomjs.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-DEBIAN_FRONTEND=noninteractive
-
-wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2
-bzip2 -dc phantomjs-1.9.8-linux-x86_64.tar.bz2 | tar xf -
-cp phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/

vagrant/webapp.sh

@@ -2,7 +2,6 @@
 
 DEBIAN_FRONTEND=noninteractive
 
-. /vagrant/vagrant/phantomjs.sh
 . /vagrant/vagrant/redis.sh
 
 apt-get install -y git curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev libffi-dev libpq-dev libmagickwand-dev imagemagick libmagickwand-dev libmagic-dev file clamav-daemon
@@ -16,4 +15,4 @@ service clamav-daemon start
 usermod -G vagrant clamav
 
 cd /vagrant
-bundle install
+bundle install