From b2f59da1fcd03f1af64b737b43aaf2955463a4b6 Mon Sep 17 00:00:00 2001
From: Michael Kalish <kalishmichael@gmail.com>
Date: Mon, 15 Oct 2018 12:58:19 -0400
Subject: [PATCH] Making Mapbox API Key and env variable

---
 .gitignore                                    |   4 +-
 Dockerfile                                    |   6 ++-
 ancfinder/database.sqlite                     | Bin 196608 -> 196608 bytes
 ancfinder/settings.py                         |  40 +++++++++++++++++-
 ancfinder_site/static/showdown.js             |   1 -
 .../templates/ancfinder_site/index.html       |   2 +-
 ancfinder_site/templates/base.html            |   2 +-
 ancfinder_site/views.py                       |   2 +
 deployment/docker-compose.yml                 |  27 ------------
 docker-compose.yml                            |  14 +++---
 nginx.conf                                    |   9 +++-
 .../nginx.conf => nginx.production.conf       |   0
 run.sh                                        |   5 +++
 sample.env                                    |   9 ++++
 14 files changed, 77 insertions(+), 44 deletions(-)
 delete mode 120000 ancfinder_site/static/showdown.js
 delete mode 100644 deployment/docker-compose.yml
 rename deployment/nginx.conf => nginx.production.conf (100%)
 create mode 100644 run.sh
 create mode 100644 sample.env

diff --git a/.gitignore b/.gitignore
index b62dcfd..988cb61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 update_anc_database_creds.py
 ancfindersite/database.sqlite
 data
+user_local_environment.yaml
 
 .DS_Store
 *~
@@ -17,4 +18,5 @@ __pycache__
 .Python
 .python-version
 lib
-include
\ No newline at end of file
+include
+anc_finder_sql
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e49414d..c86364e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,14 +8,16 @@ RUN pip install -r requirements.txt
 COPY ./ancfinder /srv/app/ancfinder
 COPY ./ancfinder_site /srv/app/ancfinder_site
 COPY ./manage.py /srv/app/manage.py
+COPY ./run.sh /srv/app/run.sh
 
+RUN chmod u+x /srv/app/run.sh
 
+VOLUME /srv/app/static
 
 EXPOSE 8000
-
 # Ensure that the model and database are correctly mapped
 # RUN python3 manage.py makemigrations
 # RUN python3 manage.py migrate
 
 # Run these when the container launches
-CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
\ No newline at end of file
+CMD ["./run.sh"]
\ No newline at end of file
diff --git a/ancfinder/database.sqlite b/ancfinder/database.sqlite
index 3d4fa81457fe5833dbf349d30957bcd92968c75e..4925e2f26e0df3bdbd612f38d6ec85341063f690 100644
GIT binary patch
delta 1705
zcmZ|Py>1gh5C?GEaXttp7xN7XhllSbr=9(nosC41yR#c!!|!pXphSY#phtNJIv#*F
zQaVIS!|n(|EbrCx)9l{ue`d9stX7jxN5hNH$IbS|pgR2he)(ZJ{JI={DLZsC^ry(D
zimISVTU+jK6=zN><P%gU>vgL`D0gBV^L1p><#w#wd|fH8%W<shzx8hY0A!=M+=_s+
z4Uin$aun;7uUku|9LBoO*U@;lKNt-5itmHsM{#*RnT<YvyY?5ja=`>bcs-sLXJ%nG
z`y_(iT6iU-%@Yoq6}%ME^boIHfEVLw7f-5tjP=^Vb7?d0A;|3ESt72@JRDahpt2f3
zNV7>g6%BJB12Zx8rV&DH5uOT}_Yg~Hp%ju!Q91}o8F-Qi))J(cg6m1+3PT_wI2Mx&
zTOyu<g(D$tCXb0Y&jB6_X?lpUnmc%ujBPWq<w|KpvhYwyF4>X9;G=^FLh5`MBs320
z3u)F#Cj*$;7#*W`FB!e~HzU_Z#8+(Mh&s3{WZpxRj-P!;NSh~`hz;Bp(&%n8<nbhJ
zeSFHPn7XHpwrJo`$kj}*-xoPph9VK3XQtX$&UD5&h66Eek3sDm+!B&o4zZ06+8|7X
zH2E$%?hk^SLhApdyIO*&jaBir_miP{X3hA@IMkZphLAQ-;=haO+!NCD5Mv#}ZY13q
z)jbBSA=r^Nxt$j;V}gn&Z71RvnYHIDv>Hu-v5<L&bjc`m9=61^854<N6{9y2()18V
e8eu4;?jZ&}r5*g{;BrvBEvR^Re(-bjtM~&5O+-Eb

delta 1705
zcmZ|POKuZE5C&k|aUKMdAv^;KLyGq%QCB~zsw1(;%s3mak$a3;WQhdVV2^SI#Et`S
zfb0+_pt}SF%RTG=Q%&3bS1%T`#bWkxe|+)jpk2Qh9q)a8e|~X3{&GI~T=#|#EuJ8q
zU_3TV!m-|5t4@P8C`V|HmU9=Qtv6DR<s8w6dOhX7n3Gs>^)%)7Pu?$ofPy!sUQ0mA
z11w3bCn=|59%6`Ck5kU&JfQR2qtR%q`aY_DR9Ba?!^wwl*Z+bw$BdRe!RzU6b?VOC
z%A8CLdol1zNjE^8VS$%Q+9IJSE?9Um-R;wtngQc2Aw1VH^D+^(<l$K+p<BJUbY36P
zSr4G3T_t@s!hsPE)ikR{Njk5Er%L8!!jaHIt)$SRJcS84!jnv}(IWLrO-sf`iyq-X
zO`&X=q^bsjeI?y$AC<UB79J~U2Z*5<dw7(M?^bJ@#+WF^5$q``G+T-H!NWr(O?isM
z7#uuM(k_!eFJK-cl)4A^v$1D?cVuZrM3~cU-%~OlAegoT?kefZgee*eca*d?-T&&g
zr&`6pu&bsik0A-Eowt?z+v(-=l4r+IWg_$9R#WUv`c<%_rYjpE9|GJ`QhpprP`toQ
zNn4)6?9jtaCCxSI|9b?9k;%YzHZ(6jGoHmoh8s${0TK)mY$<662u3upnMi+1P1z8$
zAZ+NE@|)+$1!G`66Fw_Gdsc#R7N$z(1=7c~PH2OHH8owqB*K!(L`ge9d^8MWCCvaa
Y-q`#GzuCDORc|Y*-d*neocyYO1CxzHd;kCd

diff --git a/ancfinder/settings.py b/ancfinder/settings.py
index 2ef6c27..c0f85d8 100644
--- a/ancfinder/settings.py
+++ b/ancfinder/settings.py
@@ -52,16 +52,53 @@
     # Don't put anything in this directory yourself; store your static files
     # in apps' "static/" subdirectories and in STATICFILES_DIRS.
     # Example: "/home/media/media.lawrence.com/static/"
-    STATIC_URL = env["STATIC_ROOT"]
+    STATIC_URL = "/static/"
+    STATIC_ROOT = env["STATIC_ROOT"]
 
+    MAPBOX_API_KEY = env["MAPBOX_API_KEY"]
+elif os.environ["POSTGRES_PASSWORD"]:
+
+    SECRET_KEY = os.environ['DJANGO_SECRET_KEY']
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.postgresql_psycopg2',
+            'HOST': os.environ['POSTGRES_HOST'],
+            'PORT': int(os.environ['POSTGRES_PORT']),
+            'NAME': os.environ['POSTGRES_DB'],
+            'USER': os.environ['POSTGRES_USER'],
+            'PASSWORD': os.environ['POSTGRES_PASSWORD'],
+        }
+    }
+
+    EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+
+    # EMAIL_HOST = env['SMTP_HOST']
+    # EMAIL_HOST_USER = env['SMTP_USER']
+    # EMAIL_HOST_PASSWORD = env['SMTP_PASSWORD']
+    # EMAIL_USE_TLS = True
+
+    ALLOWED_HOSTS = ["*"] # anything unexpected will be filtered out by the http server
+
+    OPENID_TEMP_FOLDER = "/tmp/openid-ancfinder"
+
+    # Absolute path to the directory static files should be collected to.
+    # Don't put anything in this directory yourself; store your static files
+    # in apps' "static/" subdirectories and in STATICFILES_DIRS.
+    # Example: "/home/media/media.lawrence.com/static/"
+    STATIC_URL = "/static/"
+    STATIC_ROOT = os.environ["STATIC_ROOT"]
+
+    MAPBOX_API_KEY = os.environ["MAPBOX_API_KEY"]
 else:
     print("Running development deployment...")
 
     SECRET_KEY = '4k90fdv_y#5na2wul&fcd&xg23va!7#3h)we)6%c2ma8mt0uc-'
     DEBUG = True
+    MAPBOX_API_KEY = os.environ['MAPBOX_API_KEY']
 
     ALLOWED_HOSTS = ["*"]
 
+
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.sqlite3',
@@ -112,7 +149,6 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'letsencrypt',
 ]
 
 MIDDLEWARE = [
diff --git a/ancfinder_site/static/showdown.js b/ancfinder_site/static/showdown.js
deleted file mode 120000
index 5d595c9..0000000
--- a/ancfinder_site/static/showdown.js
+++ /dev/null
@@ -1 +0,0 @@
-../../ext/showdown/compressed/showdown.js
\ No newline at end of file
diff --git a/ancfinder_site/templates/ancfinder_site/index.html b/ancfinder_site/templates/ancfinder_site/index.html
index 1f7eb5f..34751a1 100644
--- a/ancfinder_site/templates/ancfinder_site/index.html
+++ b/ancfinder_site/templates/ancfinder_site/index.html
@@ -31,7 +31,7 @@ <h2>Find Your ANC</h2>
 {% endblock %}
 {% block base_scripts %}
 <script>
-mapboxgl.accessToken = 'pk.eyJ1Ijoib3BlbmRhdGFkYyIsImEiOiJjaXp5dG55MjgwM2YxMnFuaHkwcmhzazViIn0.g5M1SkNciMdpOy5IJAs-ow';
+mapboxgl.accessToken = "{{ MAPBOX_API_KEY }}";
 var map = new mapboxgl.Map({
     container: 'map',
 		center: [-77.0369, 38.9072],
diff --git a/ancfinder_site/templates/base.html b/ancfinder_site/templates/base.html
index 8a6d16d..773453b 100644
--- a/ancfinder_site/templates/base.html
+++ b/ancfinder_site/templates/base.html
@@ -19,6 +19,7 @@
       <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
       <link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
 
+      {% load staticfiles %}
       <link href="{% static "css/theme.css" %}" rel="stylesheet">
       <link href="{% static "css/normalize.css" %}" rel="stylesheet">
       <link href="{% static "css/syntax.css" %}" rel="stylesheet">
@@ -83,7 +84,6 @@ <h1 class="site-title">
             <p>ANC Finder is a project in Washington, D.C. to strengthen our unique hyper-local level of government called Advisory Neighborhood Commissions (ANCs).</p>
             <p class="by">This is a project of <a href="http://codefordc.org/">Code for DC</a>. We’re volunteers interested in using technology to solve problems in our civic lives. The site is a work in progress.</p>
             <p>The source code for this website is on <a href="https://github.com/codefordc/ancfinder">github</a>.</p>
-            <p>The <a href="http://ryantroyford.com/central-union-mission/">Central Union Mission-inspired font</a> in the header is by <a href="http://ryantroyford.com/">Ryan Troy Ford</a>.</p>
         </div>
       </footer>
 
diff --git a/ancfinder_site/views.py b/ancfinder_site/views.py
index 212e540..af4c2e2 100644
--- a/ancfinder_site/views.py
+++ b/ancfinder_site/views.py
@@ -1,6 +1,7 @@
 from django.shortcuts import render
 from django.http import Http404, HttpResponse
 from django.views.generic import TemplateView
+from django.conf import settings
 import logging
 
 from ancfinder_site.models import *
@@ -40,4 +41,5 @@ def TemplateContextProcessor(request):
 	return {
 		"ancs_by_ward": sorted(ancs_by_ward.items()),
 		"anc_list": sorted(anc_list),
+		"MAPBOX_API_KEY": settings.MAPBOX_API_KEY,
 	}
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
deleted file mode 100644
index f361d36..0000000
--- a/deployment/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: '2'
-services:
-    postgres:
-        image: postgres
-        # TODO: use environment variable for password
-        environment:
-            - POSTGRES_PASSWORD=ancfinder_pass
-            - POSTGRES_USER=ancfinder
-            - POSTGRES_DB=ancfinder
-    # TODO: copy the static media into nginx from ancfinder
-    nginx:
-        image: nginx
-        volumes:
-            - ./nginx.conf:/etc/nginx/conf.d/default.conf
-            - ../uswgi_params:/home/docker/code/uwsgi_params
-            - ../etc/ssl:/etc/nginx/ssl/certs
-        ports:
-            - "80:80"
-            - "443:443"
-        links: 
-            - ancfinder
-    ancfinder:
-        image: codefordc2/ancfinder:release
-        links:
-            - postgres
-        volumes: 
-            - ./environment.yaml:/home/ancfinder/environment.yaml
diff --git a/docker-compose.yml b/docker-compose.yml
index 8814ab7..90e4820 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,7 @@ version: '3'
 services:
     postgres:
         image: postgres
-        # TODO: use environment variable for password
-        environment:
-            - POSTGRES_PASSWORD=ancfinder_pass
-            - POSTGRES_USER=ancfinder
-            - POSTGRES_DB=ancfinder
+        env_file: .env
     # TODO: copy the static media into nginx from ancfinder
     nginx:
         image: nginx:latest
@@ -15,6 +11,7 @@ services:
             - ./nginx.conf:/etc/nginx/conf.d/default.conf
             - ./uswgi_params:/home/docker/code/uwsgi_params
             - ./certs/letsencrypt:/etc/letsencrypt
+            - static:/ancfinder_static
         ports:
             - "80:80"
             - "443:443"
@@ -22,8 +19,11 @@ services:
             - ancfinder
     ancfinder:
         image: codefordc2/ancfinder:2.0
-        command: python manage.py runserver 0.0.0.0:8000
+        env_file: .env
         links:
             - postgres
         volumes:
-            - ./environment.yaml:/home/ancfinder/environment.yaml
+            - ./user_local_environment.yaml:/srv/app/environment.yaml
+            - static:/srv/app/static
+volumes:
+    static:
diff --git a/nginx.conf b/nginx.conf
index 857a54a..29e0e21 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -27,12 +27,17 @@ server {
     # max upload size
     client_max_body_size 75M;   # adjust to taste
 
-    location ~ {
-        proxy_pass http://ancfinder;
+    location /static/ {    
+        autoindex on;    
+        alias /ancfinder_static/; 
     }
 
     location /.well-known/acme-challenge {
         allow all;
         root /usr/share/nginx/html;
     }
+
+    location / {
+        proxy_pass http://ancfinder;
+    }
 }
diff --git a/deployment/nginx.conf b/nginx.production.conf
similarity index 100%
rename from deployment/nginx.conf
rename to nginx.production.conf
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..3fde58e
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+sleep 5
+python manage.py migrate
+python manage.py collectstatic --noinput
+python manage.py runserver 0.0.0.0:8000
\ No newline at end of file
diff --git a/sample.env b/sample.env
new file mode 100644
index 0000000..4537d66
--- /dev/null
+++ b/sample.env
@@ -0,0 +1,9 @@
+DJANGO_SECRET_KEY=
+
+POSTGRES_PASSWORD=
+POSTGRES_USER=ancfinder
+POSTGRES_DB=ancfinder
+POSTGRES_PORT=5432
+POSTGRES_HOST=postgres
+STATIC_ROOT=/srv/app/static
+MAPBOX_API_KEY=
\ No newline at end of file