From aa1bdbfd0ec7e1189f2364c82e1441801220a0dc Mon Sep 17 00:00:00 2001 From: Paarhati Ozkasgarli Date: Sat, 4 Mar 2017 09:14:50 +0300 Subject: [PATCH] Some New Fixes for Remote Jenkins This fixes will continue... Change-Id: I4edaf8b9b415059b0a0a712f827786f9bfc21d2b --- dash_stack_dashboard/settings.py | 11 ++++++----- dash_stack_dashboard/wsgi.py | 12 ++++-------- doc/source/conf.py | 7 +++++-- doc/source/index.rst | 30 ++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dash_stack_dashboard/settings.py b/dash_stack_dashboard/settings.py index 52889c6..ffdf9d9 100644 --- a/dash_stack_dashboard/settings.py +++ b/dash_stack_dashboard/settings.py @@ -28,8 +28,12 @@ DEBUG = True ALLOWED_HOSTS = [ 'dash-stack', '127.0.0.1', + 'demo.dash-stack.com' ] +# fullt qualified hostname or domain. Ex +SITE_ROOT_URL = 'http://demo.dash-stack.com/' + # login url LOGIN_URL = '/auth/login/' @@ -77,7 +81,7 @@ ROOT_URLCONF = 'dash_stack_dashboard.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': ['templates',], + 'DIRS': [os.path.join(BASE_DIR, 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -170,7 +174,4 @@ EMAIL_PORT = 25 EMAIL_HOST_USER = '' EMAIL_HOST_PASSWORD = '' EMAIL_USE_TLS = False -DEFAULT_EMAIL_FROM = 'admin@dash-stack.org' - -# fullt qualified hostname or domain. Ex -SITE_ROOT_URL = 'http://198.211.127.189/' \ No newline at end of file +DEFAULT_EMAIL_FROM = 'admin@dash-stack.org' \ No newline at end of file diff --git a/dash_stack_dashboard/wsgi.py b/dash_stack_dashboard/wsgi.py index 09357ad..ceab26e 100644 --- a/dash_stack_dashboard/wsgi.py +++ b/dash_stack_dashboard/wsgi.py @@ -1,16 +1,12 @@ -""" -WSGI config for dash_stack project. +import os, sys -It exposes the WSGI callable as a module-level variable named ``application``. -For more information on this file, see -https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ -""" +sys.path.append('/usr/share/dash-stack/dash_stack_dashboard') + +sys.path.append('/usr/share/dash-stack/venv/lib/python2.7/site-packages') -import os from django.core.wsgi import get_wsgi_application - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dash_stack_dashboard.settings") application = get_wsgi_application() diff --git a/doc/source/conf.py b/doc/source/conf.py index 6260f44..79f37da 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -15,6 +15,9 @@ import sys import os +import sphinx_rtd_theme + + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -100,7 +103,7 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -108,7 +111,7 @@ html_theme = 'default' #html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". diff --git a/doc/source/index.rst b/doc/source/index.rst index 4d2bb37..8ad0cea 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,6 +1,36 @@ Welcome to dash-stack's documentation! ========================================== +Installation +============ + +Follow this part of the document to install dash-stack in your environment. + +Requirements +------------ + +In order dash-stack to work correctly, you must install following OS packages: +- MariaDB Server 10.1 +- python-virtualenv +- python-pip +- libmariadbclient-dev +- libmysqlclient18-dev +- openssl +- libssl-dev +- gettext +- apache2 +- libapache2-mod-wsgi + +How to Install +-------------- + + +Configuration +============= + +Developer +========= + Contents: .. toctree::