Remove various unused configuration settings.

r2/example.ini

@@ -46,8 +46,6 @@ short_description = open source is awesome
 # -- SECRETS! <-- update these first! --
 # global secret
 SECRET = abcdefghijklmnopqrstuvwxyz0123456789
-# secret for making the modhash
-MODSECRET = abcdefghijklmnopqrstuvwxyz0123456789
 # secret for /prefs/feeds
 FEEDSECRET = abcdefghijklmnopqrstuvwxyz0123456789
 # used for authenticating admin API calls w/o cookie
@@ -59,7 +57,6 @@ CLOUDSEARCH_SUBREDDIT_SEARCH_API =
 CLOUDSEARCH_SUBREDDIT_DOC_API =
 
 # for gold purchases.
-PAYPAL_URL = https://www.paypal.com/cgi-bin/webscr
 PAYPAL_SECRET =
 PAYPAL_BUTTONID_ONETIME_BYMONTH   =
 PAYPAL_BUTTONID_ONETIME_BYYEAR    =
@@ -119,8 +116,6 @@ ip_hash =
 timezone = UTC
 # timezone for the database
 display_timezone = MST
-# secret key for accessing /shutdown
-shutdown_secret = 12345
 # https api endpoint (must be g.domain or a subdomain of g.domain)
 https_endpoint =
 # name of the cookie to drop with login information
@@ -135,9 +130,6 @@ authentication_provider = cookie
 # speed. don't worry, changing this won't break old passwords
 bcrypt_work_factor = 12
 
-# fraction of requests to pass into the queue-based usage sampler
-usage_sampling = 0.
-
 # account used for default feedback messaging (can be /r/subreddit)
 admin_message_acct = reddit
 
@@ -166,18 +158,6 @@ cassandra_wcl = ONE
 # name of default connection pool to use when _connection_pool not specified
 cassandra_default_pool = main
 
-# -- url cache options --
-url_caches = 127.0.0.1:11211
-# cassandra hosts. one of these will be chosen at random by pycassa
-url_seeds = 
-
-
-# caches for storing number of times a link is rendered 
-incr_cache = udp:localhost:11211
-incr_caches = localhost:11211
-# recommender cache (depricated)
-rec_cache = 127.0.0.1:11211
-
 ## -- traffic tracking urls --
 # domain to send tracking requests (see scripts/tracker.py)
 fetch_trackers_url = http://reddit.local/fetch-trackers
@@ -191,8 +171,6 @@ adframetracker_url = /static/pixel.png
 clicktracker_url = /static/pixel.png
 # url to request to track interaction statistics
 uitracker_url = /static/pixel.png
-# new pixel
-newtracker_url = 
 
 # amqp
 amqp_host = localhost:5672
@@ -301,8 +279,6 @@ db_servers_promocampaign = main
 ## -- traffic analytics --
 # google analytics token
 googleanalytics = 
-# machine to get traffic metrics from
-traffic_url = http://localhost:8010/tracker/pickle/
 # secret used for talking to the traffic machine
 tracking_secret = abcdefghijklmnopqrstuvwxyz0123456789
 
@@ -336,14 +312,6 @@ AWS_LOG_DIR =
 TRAFFIC_SRC_DIR =
 TRAFFIC_LOG_HOSTS = 
 
-# -- spreadshirt --
-spreadshirt_url = 
-spreadshirt_vendor_id =
-spreadshirt_min_font =  42
-spreadshirt_max_width = 620
-spreadshirt_test_font = 
-
-
 ###
 # Other magic settings
 ###
@@ -356,8 +324,6 @@ shard_link_vote_queues = false
 authorized_cnames = 
 
 # -- query cache settings --
-num_query_queue_workers = 5
-query_queue_worker = http://cslowe.local:8000
 querycache_prune_chance = 0.05
 
 # -- stylesheet editor --
@@ -384,13 +350,6 @@ static_secure_pre_gzipped = false
 # from the local database instead.
 static_stylesheet_bucket =
 
-#  -- translator UI -- 
-# reddit runs the translator UI on a different instance with a
-# password to login.  These settings are used when generating messages
-# to translators to tell them their credentials
-translator_username =
-translator_password =
-
 # subreddit used for DMCA takedowns
 takedown_sr = _takedowns
 # png compressor
@@ -457,8 +416,6 @@ ADMIN_COOKIE_MAX_IDLE = 900
 # the maximum life of an otp cookie
 OTP_COOKIE_TTL = 604800
 
-# time in days
-MODWINDOW = 2
 HOT_PAGE_AGE = 1000
 
 # -- display options --

r2/r2/lib/app_globals.py

@@ -107,7 +107,6 @@ class Globals(object):
             'max_comments',
             'max_comments_gold',
             'num_default_reddits',
-            'num_query_queue_workers',
             'max_sr_images',
             'num_serendipity',
             'sr_dropdown_threshold',
@@ -194,10 +193,6 @@ class Globals(object):
              },
         },
 
-        ConfigValue.days: [
-            'MODWINDOW',
-        ],
-
         config_gold_price: [
             'gold_month_price',
             'gold_year_price',