From 2ee9f32e0a769990038d4d56a4575c4c39b764a8 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Tue, 23 Feb 2021 19:51:05 -0500
Subject: [PATCH] Adding beta subdomain. Adding /etc/hosts for compatibility
 with existing hosts.

---
 ansible/provision.yml              | 4 ++--
 ansible/roles/base/files/zshrc.txt | 2 +-
 ansible/roles/base/tasks/main.yml  | 7 +++++++
 ansible/roles/web/tasks/main.yml   | 1 +
 apps/reader/views.py               | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ansible/provision.yml b/ansible/provision.yml
index 3a4bb89db..1a0bce280 100644
--- a/ansible/provision.yml
+++ b/ansible/provision.yml
@@ -15,7 +15,7 @@
   when: "'elasticsearch' in group_names"
 - import_playbook: setup_task.yml
   when: "'task' in group_names"
-- import_playbook: setup_debug.yml
-  when: "'debugs' in group_names"
+# - import_playbook: setup_debug.yml
+#   when: "'debugs' in group_names"
 - import_playbook: setup_consul_manager.yml
   when: "'consul' in group_names"
diff --git a/ansible/roles/base/files/zshrc.txt b/ansible/roles/base/files/zshrc.txt
index 4b981431a..65281eb67 100644
--- a/ansible/roles/base/files/zshrc.txt
+++ b/ansible/roles/base/files/zshrc.txt
@@ -43,7 +43,7 @@ alias cd..='cd ..'
 
 alias smtp='python -m smtpd -n -c DebuggingServer 127.0.0.1:1025'
 alias tlnb='echo "----------------\n"; tail -f /srv/newsblur/logs/newsblur.log'
-alias sp='/srv/newsblur/manage.py shell_plus --use-pythonrc'
+alias sp='sudo docker exec -it newsblur_web python manage.py shell_plus'
 alias cdnb='cd /srv/newsblur'
 alias sshdo=/srv/newsblur/utils/ssh.sh
 
diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index 31b6fa897..9dd8ad31e 100644
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -50,3 +50,10 @@
     owner: "{{ ansible_effective_user_id|int }}"
     group: "{{ ansible_effective_group_id|int }}"
     recurse: yes
+
+- name: Copy /etc/hosts from old installation (remove when upgraded)
+  become: yes
+  copy:
+    src: /srv/secrets-newsblur/configs/hosts
+    dest: /etc/hosts
+  tags: hosts
diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml
index db2ea3271..7d604798a 100644
--- a/ansible/roles/web/tasks/main.yml
+++ b/ansible/roles/web/tasks/main.yml
@@ -27,6 +27,7 @@
     restart_policy: unless-stopped
     volumes:
       - /srv/newsblur:/srv/newsblur
+      - /etc/hosts:/etc/hosts
 
 - name: Register web app in consul
   tags: consul
diff --git a/apps/reader/views.py b/apps/reader/views.py
index 7cc5d618f..d8dd054fd 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -69,6 +69,7 @@ BANNED_URLS = [
 ALLOWED_SUBDOMAINS = [
     'dev', 
     'www', 
+    'beta', 
     'debug', 
     'debug3', 
     'nb',