Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b3f91278
authored
Sep 01, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
settings: set up django-pipeline
parent
9362084a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
3 deletions
+77
-3
.gitignore
+1
-1
circle/circle/settings/base.py
+76
-2
No files found.
.gitignore
View file @
b3f91278
...
@@ -34,8 +34,8 @@ circle/*.key
...
@@ -34,8 +34,8 @@ circle/*.key
circle/*.pem
circle/*.pem
# collected static files:
# collected static files:
circle/static
circle/static_collected
circle/static_collected
circle/bower_components
# jsi18n files
# jsi18n files
jsi18n
jsi18n
circle/circle/settings/base.py
View file @
b3f91278
...
@@ -160,10 +160,83 @@ STATICFILES_FINDERS = (
...
@@ -160,10 +160,83 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder'
,
'django.contrib.staticfiles.finders.AppDirectoriesFinder'
,
)
)
########## END STATIC FILE CONFIGURATION
########## END STATIC FILE CONFIGURATION
STATICFILES_DIRS
=
[
normpath
(
join
(
SITE_ROOT
,
'bower_components'
))]
p
=
normpath
(
join
(
SITE_ROOT
,
'../../site-circle/static'
))
p
=
normpath
(
join
(
SITE_ROOT
,
'../../site-circle/static'
))
if
exists
(
p
):
if
exists
(
p
):
STATICFILES_DIRS
=
(
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.jsmin.JSMinCompressor'
# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
PIPELINE_JS_COMPRESSOR
=
None
# js compressors don't really like our deps
PIPELINE_CSS
=
{
"all"
:
{
"source_filenames"
:
(
"bootstrap/dist/css/bootstrap.css"
,
"bootstrap/dist/css/bootstrap-theme.css"
,
"fontawesome/css/font-awesome.css"
,
"template.css"
,
"dashboard/dashboard.css"
,
"jquery-simple-slider/css/simple-slider.css"
,
"bootstrap-tour/build/css/bootstrap-tour.css"
,
"network/network.css"
,
),
"output_filename"
:
"all.css"
,
}
}
PIPELINE_JS
=
{
"all"
:
{
"source_filenames"
:
(
# "jquery/dist/jquery.js", # included separately
"bootbox/bootbox.js"
,
"bootstrap/dist/js/bootstrap.js"
,
"bootstrap-tour/build/css/bootstrap-tour.js"
,
"jquery-knob/dist/jquery.knob.min.js"
,
"jquery-simple-slider/js/simple-slider.js"
,
"dashboard/dashboard.js"
,
"dashboard/disk-list.js"
,
"dashboard/group-details.js"
,
"dashboard/group-list.js"
,
"dashboard/js/stupidtable.min.js"
,
"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"
,
"js/host.js"
,
"js/network.js"
,
"js/switch-port.js"
,
),
"output_filename"
:
"all.js"
,
},
"vm-detail"
:
{
"source_filenames"
:
(
"no-vnc/include/util.js"
,
"no-vnc/include/ui.js"
,
"no-vnc/include/playback.js"
,
"no-vnc/include/websock.js"
,
"no-vnc/include/webutil.js"
,
"no-vnc/include/input.js"
,
"no-vnc/include/jsunzip.js"
,
"no-vnc/include/logo.js"
,
"no-vnc/include/des.js"
,
"no-vnc/include/display.js"
,
"no-vnc/include/rfb.js"
,
"no-vnc/include/base64.js"
,
"dashboard/vm-details.js"
,
"dashboard/vm-console.js"
,
"dashboard/vm-tour.js"
,
),
"output_filename"
:
"vm-detail.js"
,
},
}
########## SECRET CONFIGURATION
########## SECRET CONFIGURATION
...
@@ -266,6 +339,7 @@ THIRD_PARTY_APPS = (
...
@@ -266,6 +339,7 @@ THIRD_PARTY_APPS = (
'statici18n'
,
'statici18n'
,
'django_sshkey'
,
'django_sshkey'
,
'autocomplete_light'
,
'autocomplete_light'
,
'pipeline'
,
)
)
# Apps specific for this project go here.
# Apps specific for this project go here.
...
@@ -368,7 +442,7 @@ if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
...
@@ -368,7 +442,7 @@ if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
from
shutilwhich
import
which
from
shutilwhich
import
which
from
saml2
import
BINDING_HTTP_POST
,
BINDING_HTTP_REDIRECT
from
saml2
import
BINDING_HTTP_POST
,
BINDING_HTTP_REDIRECT
INSTALLED_APPS
+=
(
INSTALLED_APPS
+=
(
'djangosaml2'
,
'djangosaml2'
,
)
)
AUTHENTICATION_BACKENDS
=
(
AUTHENTICATION_BACKENDS
=
(
...
...
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