Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e8da56dd
authored
Jul 04, 2017
by
Czémán Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
settings: change settings format, exclude circle module from test (it brokes some test)
parent
7758d797
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
119 additions
and
108 deletions
+119
-108
circle/circle/settings/base.py
+109
-104
circle/circle/settings/local.py
+4
-2
circle/circle/settings/test.py
+6
-2
No files found.
circle/circle/settings/base.py
View file @
e8da56dd
...
...
@@ -166,95 +166,94 @@ if exists(p):
STATICFILES_DIRS
.
append
(
p
)
STATICFILES_STORAGE
=
'pipeline.storage.PipelineCachedStorage'
PIPELINE_COMPILERS
=
(
'pipeline.compilers.less.LessCompiler'
,
)
PIPELINE_CSS_COMPRESSOR
=
'pipeline.compressors.yuglify.YuglifyCompressor'
# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.slimit.SlimItCompressor'
PIPELINE_JS_COMPRESSOR
=
None
PIPELINE_DISABLE_WRAPPER
=
True
PIPELINE_LESS_ARGUMENTS
=
u'--include-path={}'
.
format
(
':'
.
join
(
STATICFILES_DIRS
))
PIPELINE_CSS
=
{
"all"
:
{
"source_filenames"
:
(
"compile_bootstrap.less"
,
"bootstrap/dist/css/bootstrap-theme.css"
,
"fontawesome/css/font-awesome.css"
,
"jquery-simple-slider/css/simple-slider.css"
,
"intro.js/introjs.css"
,
"template.less"
,
"dashboard/dashboard.less"
,
"network/network.less"
,
"autocomplete_light/style.css"
,
),
"output_filename"
:
"all.css"
,
}
}
PIPELINE_JS
=
{
"all"
:
{
"source_filenames"
:
(
# "jquery/dist/jquery.js", # included separately
"bootbox/bootbox.js"
,
"bootstrap/dist/js/bootstrap.js"
,
"intro.js/intro.js"
,
"jquery-knob/dist/jquery.knob.min.js"
,
"jquery-simple-slider/js/simple-slider.js"
,
"favico.js/favico.js"
,
"datatables/media/js/jquery.dataTables.js"
,
"dashboard/dashboard.js"
,
"dashboard/activity.js"
,
"dashboard/group-details.js"
,
"dashboard/group-list.js"
,
"dashboard/js/stupidtable.min.js"
,
# no bower file
"dashboard/node-create.js"
,
"dashboard/node-details.js"
,
"dashboard/node-list.js"
,
"dashboard/profile.js"
,
"dashboard/store.js"
,
"dashboard/template-list.js"
,
"dashboard/vm-common.js"
,
"dashboard/vm-create.js"
,
"dashboard/vm-list.js"
,
"dashboard/help.js"
,
"js/host.js"
,
"js/network.js"
,
"js/switch-port.js"
,
"js/host-list.js"
,
"autocomplete_light/autocomplete.js"
,
"autocomplete_light/widget.js"
,
"autocomplete_light/addanother.js"
,
"autocomplete_light/text_widget.js"
,
"autocomplete_light/remote.js"
,
),
"output_filename"
:
"all.js"
,
},
"vm-detail"
:
{
"source_filenames"
:
(
"dashboard/vm-details.js"
,
"no-vnc/include/util.js"
,
"no-vnc/include/webutil.js"
,
"no-vnc/include/base64.js"
,
"no-vnc/include/websock.js"
,
"no-vnc/include/des.js"
,
"no-vnc/include/keysym.js"
,
"no-vnc/include/keysymdef.js"
,
"no-vnc/include/keyboard.js"
,
"no-vnc/include/input.js"
,
"no-vnc/include/display.js"
,
"no-vnc/include/jsunzip.js"
,
"no-vnc/include/rfb.js"
,
"dashboard/vm-console.js"
,
"dashboard/vm-tour.js"
,
),
"output_filename"
:
"vm-detail.js"
,
PIPELINE
=
{
'COMPILERS'
:
(
'pipeline.compilers.less.LessCompiler'
,),
'LESS_ARGUMENTS'
:
u'--include-path={}'
.
format
(
':'
.
join
(
STATICFILES_DIRS
)),
'CSS_COMPRESSOR'
:
'pipeline.compressors.yuglify.YuglifyCompressor'
,
'JS_COMPRESSOR'
:
None
,
'DISABLE_WRAPPER'
:
True
,
'STYLESHEETS'
:
{
"all"
:
{
"source_filenames"
:
(
"compile_bootstrap.less"
,
"bootstrap/dist/css/bootstrap-theme.css"
,
"fontawesome/css/font-awesome.css"
,
"jquery-simple-slider/css/simple-slider.css"
,
"intro.js/introjs.css"
,
"template.less"
,
"dashboard/dashboard.less"
,
"network/network.less"
,
"autocomplete_light/style.css"
,
),
"output_filename"
:
"all.css"
,
}
},
"datastore"
:
{
"source_filenames"
:
(
"chart.js/dist/Chart.min.js"
,
"dashboard/datastore-details.js"
),
"output_filename"
:
"datastore.js"
,
'JAVASCRIPT'
:
{
"all"
:
{
"source_filenames"
:
(
# "jquery/dist/jquery.js", # included separately
"bootbox/bootbox.js"
,
"bootstrap/dist/js/bootstrap.js"
,
"intro.js/intro.js"
,
"jquery-knob/dist/jquery.knob.min.js"
,
"jquery-simple-slider/js/simple-slider.js"
,
"favico.js/favico.js"
,
"datatables/media/js/jquery.dataTables.js"
,
"dashboard/dashboard.js"
,
"dashboard/activity.js"
,
"dashboard/group-details.js"
,
"dashboard/group-list.js"
,
"dashboard/js/stupidtable.min.js"
,
# no bower file
"dashboard/node-create.js"
,
"dashboard/node-details.js"
,
"dashboard/node-list.js"
,
"dashboard/profile.js"
,
"dashboard/store.js"
,
"dashboard/template-list.js"
,
"dashboard/vm-common.js"
,
"dashboard/vm-create.js"
,
"dashboard/vm-list.js"
,
"dashboard/help.js"
,
"js/host.js"
,
"js/network.js"
,
"js/switch-port.js"
,
"js/host-list.js"
,
"autocomplete_light/autocomplete.js"
,
"autocomplete_light/widget.js"
,
"autocomplete_light/addanother.js"
,
"autocomplete_light/text_widget.js"
,
"autocomplete_light/remote.js"
,
),
"output_filename"
:
"all.js"
,
},
"vm-detail"
:
{
"source_filenames"
:
(
"dashboard/vm-details.js"
,
"no-vnc/include/util.js"
,
"no-vnc/include/webutil.js"
,
"no-vnc/include/base64.js"
,
"no-vnc/include/websock.js"
,
"no-vnc/include/des.js"
,
"no-vnc/include/keysym.js"
,
"no-vnc/include/keysymdef.js"
,
"no-vnc/include/keyboard.js"
,
"no-vnc/include/input.js"
,
"no-vnc/include/display.js"
,
"no-vnc/include/jsunzip.js"
,
"no-vnc/include/rfb.js"
,
"dashboard/vm-console.js"
,
"dashboard/vm-tour.js"
,
),
"output_filename"
:
"vm-detail.js"
,
},
"datastore"
:
{
"source_filenames"
:
(
"chart.js/dist/Chart.min.js"
,
"dashboard/datastore-details.js"
),
"output_filename"
:
"datastore.js"
,
},
},
}
########## SECRET CONFIGURATION
# See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
# Note: This key should only be used for development and testing.
...
...
@@ -278,26 +277,31 @@ FIXTURE_DIRS = (
########## TEMPLATE CONFIGURATION
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
TEMPLATE_CONTEXT_PROCESSORS
=
(
'django.contrib.auth.context_processors.auth'
,
'django.core.context_processors.debug'
,
'django.core.context_processors.i18n'
,
'django.core.context_processors.media'
,
'django.core.context_processors.static'
,
'django.core.context_processors.tz'
,
'django.contrib.messages.context_processors.messages'
,
'django.core.context_processors.request'
,
'dashboard.context_processors.notifications'
,
'dashboard.context_processors.extract_settings'
,
'dashboard.context_processors.broadcast_messages'
,
)
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
TEMPLATE_DIRS
=
(
normpath
(
join
(
SITE_ROOT
,
'../../site-circle/templates'
)),
normpath
(
join
(
SITE_ROOT
,
'templates'
)),
)
# See: https://docs.djangoproject.com/en/dev/ref/settings/#TEMPLATES
TEMPLATES
=
[{
'BACKEND'
:
'django.template.backends.django.DjangoTemplates'
,
'DIRS'
:
(
normpath
(
join
(
SITE_ROOT
,
'../../site-circle/templates'
)),
normpath
(
join
(
SITE_ROOT
,
'templates'
)),
),
'APP_DIRS'
:
True
,
'OPTIONS'
:
{
'context_processors'
:
(
'django.contrib.auth.context_processors.auth'
,
'django.template.context_processors.debug'
,
'django.template.context_processors.i18n'
,
'django.template.context_processors.media'
,
'django.template.context_processors.static'
,
'django.template.context_processors.tz'
,
'django.contrib.messages.context_processors.messages'
,
'django.template.context_processors.request'
,
'dashboard.context_processors.notifications'
,
'dashboard.context_processors.extract_settings'
,
'dashboard.context_processors.broadcast_messages'
,
),
},
}]
########## END TEMPLATE CONFIGURATION
...
...
@@ -347,7 +351,8 @@ THIRD_PARTY_APPS = (
'taggit'
,
'statici18n'
,
'django_sshkey'
,
'autocomplete_light'
,
'dal'
,
'dal_select2'
,
'pipeline'
,
)
...
...
circle/circle/settings/local.py
View file @
e8da56dd
...
...
@@ -27,7 +27,7 @@ from base import * # noqa
DEBUG
=
True
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
TEMPLATE
_DEBUG
=
DEBUG
TEMPLATE
S
[
0
][
'OPTIONS'
][
'debug'
]
=
DEBUG
########## END DEBUG CONFIGURATION
SECURE_PROXY_SSL_HEADER
=
(
'HTTP_X_FORWARDED_PROTOCOL'
,
'https'
)
...
...
@@ -110,8 +110,10 @@ if DEBUG:
from
django.dispatch
import
Signal
Signal
.
send_robust
=
Signal
.
send
PIPELINE
_COMPILERS
=
(
PIPELINE
[
"COMPILERS"
]
=
(
'dashboard.compilers.DummyLessCompiler'
,
)
ADMIN_ENABLED
=
True
ALLOWED_HOSTS
=
[
'*'
]
circle/circle/settings/test.py
View file @
e8da56dd
...
...
@@ -38,7 +38,11 @@ INSTALLED_APPS += (
'django_nose'
,
)
TEST_RUNNER
=
'django_nose.NoseTestSuiteRunner'
NOSE_ARGS
=
[
'--with-doctest'
,
'--exclude-dir=dashboard/tests/selenium'
]
NOSE_ARGS
=
[
'--with-doctest'
,
'--exclude-dir=dashboard/tests/selenium'
,
'--exclude=circle'
]
PASSWORD_HASHERS
=
[
'django.contrib.auth.hashers.MD5PasswordHasher'
]
CACHES
=
{
...
...
@@ -59,7 +63,7 @@ for i in LOCAL_APPS:
# don't print SQL queries
LOGGING
[
'handlers'
][
'null'
]
=
{
'level'
:
"DEBUG"
,
'class'
:
"
django.utils.lo
g.NullHandler"
}
'class'
:
"
loggin
g.NullHandler"
}
LOGGING
[
'loggers'
][
'django.db.backends'
]
=
{
'handlers'
:
[
'null'
],
'propagate'
:
False
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment