public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dejal' into catalyst

Browse source
This commit is contained in:
David Sinclair 2023-01-04 16:07:45 -06:00
commit 5af9a9602b
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ansible/roles/elasticsearch/templates/consul_service.json
View file

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

3
apps/reader/views.py
View file

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

2
apps/search/management/commands/index_stories.py
View file

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

4
terraform/digitalocean.tf
View file

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