From 274d0e3aed1a3d6e8bae2eb0eec3d125209cdf41 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 4 Jan 2023 09:44:21 -0500 Subject: [PATCH] New Elasticsearch server. --- ansible/roles/elasticsearch/templates/consul_service.json | 2 +- apps/search/management/commands/index_stories.py | 2 +- terraform/digitalocean.tf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/elasticsearch/templates/consul_service.json b/ansible/roles/elasticsearch/templates/consul_service.json index 188915094..71e1ea280 100644 --- a/ansible/roles/elasticsearch/templates/consul_service.json +++ b/ansible/roles/elasticsearch/templates/consul_service.json @@ -1,6 +1,6 @@ { "service": { - "name": "db-elasticsearch-staging", + "name": "db-elasticsearch", "tags": [ "db" ], diff --git a/apps/search/management/commands/index_stories.py b/apps/search/management/commands/index_stories.py index f8872fafa..b63faa98c 100644 --- a/apps/search/management/commands/index_stories.py +++ b/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: diff --git a/terraform/digitalocean.tf b/terraform/digitalocean.tf index 9dfa66f0f..b47a67a37 100644 --- a/terraform/digitalocean.tf +++ b/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]