Fakultas Ilmu Komputer UI

Commit 857a667a authored by Fakhira Devina's avatar Fakhira Devina
Browse files

Merge branch 'master' into staging

parents 40f0b4d8 04b3b161
Pipeline #63545 canceled with stages
......@@ -26,12 +26,11 @@ SECRET_KEY = os.getenv("SECRET_KEY", 'akua')
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'poipole-staging.herokuapp.com',
'34.101.147.63', 'www.poipole.com']
DEBUG = FALSE
ALLOWED_HOSTS = ['localhost', '127.0.0.1', '10.119.105.26', 'bisago.cs.ui.ac.id']
#ALLOWED_HOSTS = ['*']
# Application definition
INSTALLED_APPS = [
......@@ -98,16 +97,16 @@ WSGI_APPLICATION = 'pplbackend.wsgi.application'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': os.environ.get('DB_NAME', 'postgres'),
'USER': os.environ.get('DB_USER', 'postgres'),
'PASSWORD': os.environ.get('DB_PASSWORD', 'postgres'),
'NAME': os.environ.get('DB_NAME', ''),
'USER': os.environ.get('DB_USER', ''),
'PASSWORD': os.environ.get('DB_PASSWORD', ''),
'HOST': os.environ.get('DB_HOST', 'localhost'),
'PORT': os.environ.get('DB_PORT', '5432'),
}
}
if os.environ.get("DATABASE_URL"):
DATABASES['default'] = dj_database_url.config()
#if os.environ.get("DATABASE_URL"):
# DATABASES['default'] = dj_database_url.config()
......@@ -154,19 +153,14 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.0/howto/static-files/
AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID")
AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY")
AWS_STORAGE_BUCKET_NAME = os.getenv("AWS_STORAGE_BUCKET_NAME")
AWS_S3_OBJECT_PARAMETERS = {
'CacheControl': 'max-age=86400',
}
AWS_S3_CUSTOM_DOMAIN = '%s.s3.amazonaws.com' % os.getenv("AWS_STORAGE_BUCKET_NAME")
AWS_LOCATION = 'static'
STATIC_URL = 'https://%s/%s/' % (AWS_S3_CUSTOM_DOMAIN, AWS_LOCATION)
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
DEFAULT_FILE_STORAGE = 'pplbackend.storage_backends.MediaStorage'
MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
#STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
#DEFAULT_FILE_STORAGE = 'pplbackend.storage_backends.MediaStorage'
#Rest API Settings
SITE_ID = 1
......@@ -214,11 +208,11 @@ PASSWORD_HASHERS = [
'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
]
EMAIL_HOST = 'smtp.gmail.com'
EMAIL_HOST = os.getenv("EMAIL_HOST")
EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER")
EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD")
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_PORT = 25
EMAIL_USE_TLS = False
GOOGLE_OAUTH2_CLIENT_ID = os.getenv("GOOGLE_OAUTH2_CLIENT_ID")
GOOGLE_OAUTH2_CLIENT_SECRET = os.getenv("GOOGLE_OAUTH_CLIENT_SECRET")
......
......@@ -42,5 +42,4 @@ urlpatterns = [
path('request-token/', views.obtain_auth_token, name='token-request-auth'),
#path('api-token-auth/', views.obtain_auth_token, name='api-token-auth'),
path('informasi-fasilitas/', include('informasi_fasilitas.urls')),
path('layanan-khusus/', include('layanan_khusus.urls'))
]
path('layanan-khusus/', include('layanan_khusus.urls'))] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
asgiref==3.3.1
astroid==2.4.2
boto3==1.16.36
botocore==1.19.36
cachetools==4.1.1
certifi==2020.11.8
chardet==3.0.4
coverage==4.4.1
astroid==2.5
boto3==1.17.12
botocore==1.20.12
cachetools==4.2.1
certifi==2020.12.5
chardet==4.0.0
coverage==5.4
defusedxml==0.6.0
dj-database-url==0.4.2
Django==2.2
django-allauth==0.41.0
dj-database-url==0.5.0
Django==3.1.7
django-allauth==0.44.0
django-cors-middleware==1.5.0
django-environ==0.4.4
django-environ==0.4.5
django-multiselectfield==0.1.12
django-oauth-toolkit==1.3.2
django-oauth-toolkit==1.4.0
django-rest-auth==0.9.5
django-storages==1.11.1
djangorestframework==3.11.0
djangorestframework-simplejwt==4.4.0
google-api-python-client==1.7.11
google-auth==1.11.2
google-auth-httplib2==0.0.3
gunicorn==19.7.1
httplib2==0.17.0
django-utils-six==2.0
djangorestframework==3.12.2
djangorestframework-simplejwt==4.6.0
google-api-python-client==1.12.8
google-auth==1.27.0
google-auth-httplib2==0.0.4
gunicorn==20.0.4
httplib2==0.19.0
idna==2.6
isort==4.2.15
isort==5.7.0
jmespath==0.10.0
lazy-object-proxy==1.4.3
lazy-object-proxy==1.5.2
mccabe==0.6.1
oauthlib==3.1.0
Pillow==7.0.0
psycopg2-binary==2.8.5
Pillow==8.1.0
psycopg2-binary==2.8.6
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.19
PyJWT==1.7.1
pylint==2.5.0
pylint-django==2.0.15
pycparser==2.20
PyJWT==2.0.1
pylint==2.7.0
pylint-django==2.4.2
pylint-plugin-utils==0.6
python-dateutil==2.8.1
python3-openid==3.1.0
pytz==2017.2
requests==2.24.0
python-dotenv==0.15.0
python3-openid==3.2.0
pip-upgrader==1.4.15
pytz==2021.1
requests==2.25.1
requests-oauthlib==1.3.0
rsa==4.0
s3transfer==0.3.3
selenium==3.5.0
six==1.12.0
social-auth-app-django==3.1.0
social-auth-core==3.2.0
rsa==4.7.1
s3transfer==0.3.4
selenium==3.141.0
six==1.15.0
social-auth-app-django==4.0.0
social-auth-core==4.0.3
sqlparse==0.4.1
toml==0.10.2
typed-ast==1.4.1
typed-ast==1.4.2
uritemplate==3.0.1
urllib3==1.25.8
whitenoise==3.3.0
urllib3==1.26.3
whitenoise==5.2.0
wrapt==1.12.1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment