CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into better-extra-scripts

This commit is contained in:
Marko Bocevski 2018-08-23 17:56:02 +02:00 committed by GitHub
parent c0e229197e 374a347be2
commit 22b024fed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rootfs/setup/app/prerun.py
View File

@ -3,6 +3,7 @@ import sys
import subprocess
import psycopg2
import urllib2
import re
ckan_ini = os.environ.get('CKAN_INI', '/srv/app/production.ini')
@ -85,7 +86,7 @@ def create_sysadmin():
command = ['paster', '--plugin=ckan', 'user', name, '-c', ckan_ini]
out = subprocess.check_output(command)
if 'User: \nNone\n' not in out:
if 'User:None' not in re.sub(r'\s', '', out):
print '[prerun] Sysadmin user exists, skipping creation'
return

2
rootfs/setup/app/start_ckan.sh
View File

@ -16,7 +16,7 @@ then
fi
# Set the common uwsgi options
UWSGI_OPTS="--plugins http,python,gevent --socket /tmp/uwsgi.sock --uid 92 --gid 92 --http :5000 --master --enable-threads --paste config:/srv/app/production.ini --lazy-apps --gevent 2000 -p 2 -L"
UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid 92 --gid 92 --http :5000 --master --enable-threads --paste config:/srv/app/production.ini --lazy-apps --gevent 2000 -p 2 -L"
# Check whether http basic auth password protection is enabled and enable basicauth routing on uwsgi respecfully
if [ $? -eq 0 ]