Fakultas Ilmu Komputer UI
Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Ryan Karyadiputera
ppl-berkah-back
Commits
ff8ab05d
Commit
ff8ab05d
authored
Apr 28, 2021
by
Ryan Karyadiputera
Browse files
test
parent
a8cec21c
Pipeline
#73851
passed with stage
in 2 minutes and 20 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
sip/settings/dev.py
View file @
ff8ab05d
...
...
@@ -14,8 +14,6 @@ import environ
import
os
import
dj_database_url
from
datetime
import
timedelta
import
mimetypes
mimetypes
.
add_type
(
"text/css"
,
".css"
,
True
)
# Environ Setup
...
...
sip/settings/staging.py
View file @
ff8ab05d
...
...
@@ -15,11 +15,7 @@ import os
# import sys
import
dj_database_url
from
datetime
import
timedelta
import
mimetypes
mimetypes
.
add_type
(
"text/css"
,
".css"
,
True
)
#env = environ.Env()
#environ.Env.read_env() # Reading .env file
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR
=
os
.
path
.
dirname
(
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
)))
...
...
@@ -28,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY
=
os
.
getenv
(
'
DJANGO_SECRET_KEY
'
,
"s3cr3t_k3y_c4nn0t_h4ck3d_by_l33t_1337
"
)
SECRET_KEY
=
os
.
environ
.
get
(
"
DJANGO_SECRET_KEY"
)
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG
=
False
...
...
@@ -124,7 +120,7 @@ if os.environ.get('DATABASE_URL') is not None:
# DOMAIN='https://ppl2020a1.cs.ui.ac.id'
# else:
# DOMAIN='http://sipraktikum-backend.herokuapp.com'
# DOMAIN='http://si
-
praktikum-backend.herokuapp.com'
# Password validation
...
...
@@ -176,7 +172,7 @@ AWS_S3_CUSTOM_DOMAIN = '%s.s3.amazonaws.com' % AWS_STORAGE_BUCKET_NAME
AWS_LOCATION
=
'static'
STATIC_URL
=
'/static/'
STATIC_ROOT
=
os
.
path
.
join
(
BASE_DIR
,
'static
files
'
)
STATIC_ROOT
=
os
.
path
.
join
(
PROJECT_ROOT
,
'static'
)
STATICFILES_DIRS
=
[
'static/'
,
os
.
path
.
join
(
BASE_DIR
,
"static"
),
...
...
@@ -235,7 +231,7 @@ JWT_AUTH = {
'JWT_AUTH_COOKIE'
:
None
,
}
SUCCESS_SSO_AUTH_REDIRECT
=
"http://
ppl-berkah
.herokuapp.com/"
SUCCESS_SSO_AUTH_REDIRECT
=
"http://
sipraktikum-frontend-2020-a
.herokuapp.com/"
CORS_ORIGIN_ALLOW_ALL
=
True
# CORS_ORIGIN_WHITELIST = [
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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