Requested changes have been made

MilhemetKohavim · Feb 7, 2019 · 8c04714 · 8c04714
1 parent e7b0123
commit 8c04714
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/build_scripts/app_setup/app_setup.sh b/build_scripts/app_setup/app_setup.sh
@@ -42,19 +42,20 @@ yum -y groupinstall "Development Tools"
 # 7. Install Required pip Packages
 source /opt/rh/rh-python35/enable
 pip install virtualenv
+pip install --upgrade pip setuptools
 mkdir /home/vagrant/.virtualenvs
-virtualenv --system-site-packages /home/vagrant/.virtualenvs/openrecords
+sudo -E vagrant virtualenv --system-site-packages /home/vagrant/.virtualenvs/openrecords
 chown -R vagrant:vagrant /home/vagrant
 source /home/vagrant/.virtualenvs/openrecords/bin/activate
 pip install -r /vagrant/requirements/common.txt
 
-if [ "$1" -eq development ] || [ "$2" -eq development ]; then
+if [[ "$1" -eq development ]] || [[ "$2" -eq development ]]; then
     pip install -r /vagrant/requirements/dev.txt
     yum -y install telnet-server
     yum -y install telnet
 fi
 
-if [ "$1" -eq rhel ] || [ "$2" -eq rhel ]; then
+if [[ "$1" -eq rhel ]] || [[ "$2" -eq rhel ]]; then
     pip install -r /vagrant/requirements/rhel.txt
 fi
 

diff --git a/build_scripts/default/nginx_conf/sites/openrecords_v2_0.conf b/build_scripts/default/nginx_conf/sites/openrecords_v2_0.conf
@@ -28,7 +28,7 @@ map $openrecords_hascookie$openrecords_geo $openrecords_authentication{
 
 server {
     listen                              80;
-    server_name                         openrecords-dev-joel.appdev.records.nycnet;
+    server_name                         10.0.0.2;
     client_max_body_size                20M;
 
     if ( $request_method ~ ^(GET|POST|HEAD|PATCH|DELETE|PUT) ) {
@@ -40,7 +40,7 @@ server {
   set $maintenance_mode 0;
   error_log                             /tmp/openrecords_v2_0.nyc.log debug;
   listen                                443 ssl;
-  server_name                           openrecords-dev-joel.appdev.records.nycnet;
+  server_name                           10.0.0.2;
 
   add_header X-Frame-Options            SAMEORIGIN;
   add_header X-Content-Type-Options     nosniff;
@@ -103,7 +103,7 @@ server {
 server {
   error_log                             /tmp/openrecords_v2_0.nyc.es.log debug;
   listen                                8200 ssl;
-  server_name                           openrecords-dev-joel.appdev.records.nycnet;
+  server_name                           10.0.0.2;
 
   add_header X-Frame-Options            SAMEORIGIN;
   add_header X-Content-Type-Options     nosniff;

diff --git a/celery_worker.py b/celery_worker.py
@@ -7,5 +7,5 @@
 import os
 from app import celery, create_app
 
-app = create_app(os.getenv('FLASK_CONFIG') or 'default', jobs_enabled=False)  # FIXME: creating app twice?!
+app = create_app(os.getenv('FLASK_CONFIG') or 'default')
 app.app_context().push()
diff --git a/requirements/common.txt b/requirements/common.txt
@@ -53,7 +53,7 @@ paramiko==2.4.2
 pdfrw==0.4
 Pillow==5.4.1
 pkgconfig==1.4.0
-psycopg2==2.7.7
+psycopg2==2.6.1
 pyasn1==0.4.5
 pycparser==2.19
 PyNaCl==1.3.0

diff --git a/requirements/rhel.txt b/requirements/rhel.txt
@@ -1,2 +1,2 @@
 -r common.txt
-psycopg2==2.6.2
+psycopg2==2.6.1