production: Reconcile differences that have arisen between master and production

requirements.txt

@@ -1,52 +1,56 @@
 -i https://pypi.org/simple
 anyjson==0.3.3
-atomicwrites==1.2.1
-attrs==18.2.0
-certifi==2019.6.16
+atomicwrites==1.3.0
+attrs==19.3.0
+certifi==2019.11.28
 chardet==3.0.4
-coverage==4.5.3
-coveralls==1.8.1
-django-debug-toolbar==2.0
-django-redis-cache==2.0.0
-django-reversion==3.0.4
+coverage==5.0.3
+coveralls==1.10.0
+django-debug-toolbar==2.1
+django-redis-cache==2.1.0
+django-reversion==3.0.5
 django-user-agents==0.4.0
-django>=2.2.6
+django==2.2.9
 docopt==0.6.2
 feedparser==5.2.1
-geojson==1.3.5
+geojson==2.5.0
 idna==2.8
+importlib-metadata==1.4.0 ; python_version < '3.8'
 isodate==0.6.0
 jsonfield==2.0.2
-lxml==4.3.4
-more-itertools==4.3.0
+lxml==4.4.2
+more-itertools==8.1.0
 mysolr==0.8.3
-numpy==1.16.4
-pandas==0.22.0
-pathlib2==2.3.2
-pillow>=6.2.0
-pluggy==0.8.0
-psycopg2==2.7.5
-py==1.7.0
-pyparsing==2.1.1
-pyproj==2.2.1
-pytest-django==3.4.3
-pytest==3.9.3
-python-dateutil==2.5.3
+numpy==1.18.1
+packaging==20.1
+pandas==0.25.3
+pathlib2==2.3.5
+pillow==7.0.0
+pluggy==0.13.1
+psycopg2==2.8.4
+py==1.8.1
+pyparsing==2.4.6
+pyproj==2.4.2.post1
+pytest-django==3.8.0
+pytest==5.3.4
+python-dateutil==2.8.1
 python-memcached==1.59
-pytz==2016.4
-pyyaml==5.1.1
+pytz==2019.3
+pyyaml==5.3
 rdflib-jsonld==0.4.0
-rdflib==4.2.1
-redis==3.2.1
+rdflib==4.2.2
+redis==3.3.11
 requests==2.22.0
-roman==2.0.0
-scipy==1.3.0
-shapely==1.5.15
-six==1.10.0
+roman==3.2
+scipy==1.4.1
+shapely==1.6.4.post2
+six==1.14.0
 sqlparse==0.3.0
-titlecase==0.9.0
+titlecase==0.12.0
 ua-parser==0.8.0
-unidecode==0.4.19
-urllib3==1.25.3
+unidecode==1.1.1
+urllib3==1.25.8
 user-agents==2.0
-uwsgi==2.0.17.1
+uwsgi==2.0.18
+wcwidth==0.1.8
+zipp==2.0.1

sysadmin/build.yml

@@ -432,7 +432,7 @@
         - restart nginx
 
     - name: run uwsgi
-      shell: "{{oc_install_dir}}/.venv/bin/uwsgi --http :8000 --ini {{oc_web_dir}}/uwsgi_oc.ini"
+      shell: "{{oc_install_dir}}/.venv/bin/uwsgi --http :8081 --ini {{oc_web_dir}}/uwsgi_oc.ini"
       become: yes
       become_user: "{{user_owner}}"
 
@@ -586,7 +586,9 @@
       template:
         src: "templates/{{item}}.j2"
         dest: "{{oc_install_dir}}/{{item}}"
-        mode: 0770
+        owner: root
+        group: "{{group_owner}}"
+        mode: 0754
       with_items:
         - start-no-db.sh
         - oc-check.sh
@@ -597,7 +599,7 @@
         - rm-logs.sh
         - update-oc.sh
       become: yes
-      become_user: "{{user_owner}}"
+      become_user: root
 
     - name: Change file ownership for git repo
       command: "chown -R {{user_owner}}:{{group_owner}} {{oc_install_dir}}"

sysadmin/templates/start-no-db.sh.j2

@@ -5,7 +5,7 @@ source {{oc_install_dir}}/.venv/bin/activate
 for (( iport=8081; iport<=8090; iport++ ))
 do
     # killall -s INT {{oc_install_dir}}/.venv/bin/uwsgi
-    pkill -INT {{oc_install_dir}}/.venv/bin/uwsgi
+    pkill -9 uwsgi
     sudo rm -f {{oc_web_dir}}/uwsgi_oc.pid
     sudo rm -f {{oc_web_dir}}/uwsgi_oc.sock
     sudo rm -f {{oc_web_dir}}/uwsgi_oc.log
@@ -15,7 +15,7 @@ do
        else
            echo "Trying to start Open Context UWSGI on $iport";
            # uwsgi --http-socket :$iport --ini /var/oc-venv/oc.ini
-           {{oc_install_dir}}/.venv/bin/uwsgi --http-socket :$iport --ini {{oc_web_dir}}/uwsgi_oc.ini
+           sudo -u www-data {{oc_install_dir}}/.venv/bin/uwsgi --http-socket :$iport --ini {{oc_web_dir}}/uwsgi_oc.ini
            sudo /etc/init.d/nginx restart
            break
     fi

sysadmin/templates/startup.sh.j2

@@ -17,7 +17,7 @@ echo "Preparing the Python virtual environment...";
 source .venv/bin/activate
 for (( iport=8081; iport<=8090; iport++ ))
 do
-    pkill -INT {{oc_install_dir}}/.venv/bin/uwsgi
+    pkill -9 uwsgi
     sudo rm -f {{oc_web_dir}}/uwsgi_oc.pid
     sudo rm -f {{oc_web_dir}}/uwsgi_oc.sock
     sudo rm -f {{oc_web_dir}}/uwsgi_oc.log
@@ -26,7 +26,7 @@ do
            echo "$iport seems busy, trying another...";
        else
            echo "Trying to start Open Context UWSGI on $iport";
-           {{oc_install_dir}}/.venv/bin/uwsgi  --http-socket :$iport --ini {{oc_web_dir}}/uwsgi_oc.ini
+           sudo -u www-data {{oc_install_dir}}/.venv/bin/uwsgi  --http-socket :$iport --ini {{oc_web_dir}}/uwsgi_oc.ini
            sudo /etc/init.d/nginx restart
            break
     fi