Merge branch 'dejal' into catalyst

ansible/roles/elasticsearch/templates/consul_service.json

@@ -1,6 +1,6 @@
 {
     "service": {
-        "name": "db-elasticsearch-staging",
+        "name": "db-elasticsearch",
         "tags": [
             "db"
         ],

apps/reader/views.py

@@ -363,7 +363,8 @@ def load_feeds(request):
         'starred_counts': starred_counts,
         'saved_searches': saved_searches,
         'dashboard_rivers': dashboard_rivers,
-        'categories': categories
+        'categories': categories,
+        'share_ext_token': user.profile.secret_token,
     }
     return data
 

apps/search/management/commands/index_stories.py

@@ -19,7 +19,7 @@ class Command(BaseCommand):
         if not options['user']:
             print("Missing user. Did you want to reindex everything? Use -R.")
             return
-        print(options)
+        
         if re.match(r"([0-9]+)", options['user']):
             user = User.objects.get(pk=int(options['user']))
         else:

terraform/digitalocean.tf

@@ -329,10 +329,10 @@ resource "digitalocean_droplet" "node-page" {
 }
 
 resource "digitalocean_droplet" "db-elasticsearch" {
-  count    = 2
+  count    = 1
   image    = var.droplet_os
   # name     = "db-elasticsearch"
-  name     = contains([0], count.index) ? "db-elasticsearch" : "db-elasticsearch${count.index}"
+  name     = "db-elasticsearch${count.index+1}"
   region   = var.droplet_region
   size     = var.elasticsearch_droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]