diff options
| -rw-r--r-- | Makefile.example | 3 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 5 | ||||
| -rw-r--r-- | install/uwsgi.ini.template | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.example b/Makefile.example index 7afbe8f04..14e6032a4 100644 --- a/Makefile.example +++ b/Makefile.example @@ -61,6 +61,9 @@ build_gitlab: clean collectstatic test_gitlab: build_gitlab cd $(project); $(PYTHON) manage.py test $(apps) +soft_test_gitlab: build_gitlab + cd $(project); $(PYTHON) manage.py -k test $(apps) + pep8: pep8 --filename=*.py --ignore=W --exclude="manage.py,settings.py,migrations" --statistics --repeat . diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index 64853932f..e635dffef 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -277,7 +277,7 @@ EOF "$INSTANCE/local_settings.py" if [ -f $CONFIG_PATH"extra_settings.py" ]; then - cat $CONFIG_PATH"extra_settings.py" >> "$INSTANCE/local_settings.py" + ln -s $CONFIG_PATH"extra_settings.py" >> "$INSTANCE/extra_settings.py" fi ### UWSGI diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index 93ccdc01a..aecad17a6 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -35,3 +35,8 @@ DATABASES = { 'PASSWORD': '#DB_PASSWORD#', } } + +try: + from extra_settings import * +except ImportError as e: + print('Unable to load extra_settings.py:', e) diff --git a/install/uwsgi.ini.template b/install/uwsgi.ini.template index 51a4c5b7f..915087258 100644 --- a/install/uwsgi.ini.template +++ b/install/uwsgi.ini.template @@ -10,6 +10,7 @@ master = true protocol = uwsgi env = DJANGO_SETTINGS_MODULE=%(projectname).settings pythonpath = %(base) +pythonpath = %(base)/%(projectname) module = %(projectname).wsgi socket = 127.0.0.1:#UWSGI_PORT# logto = /var/log/django/uwsgi-%(projectname).log |