You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/05/31 20:36:10 UTC
[airavata-django-portal] branch master updated (05b7241 -> 31b7e80)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 05b7241 AIRAVATA-3016 Fixing user storage dir for shared data products
new 7d4b23a Removing unintentional committed file
new 31b7e80 Adding `settings_local*.py` to .gitignore
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
django_airavata/settings_local_seagrid.py | 147 ------------------------------
2 files changed, 1 insertion(+), 147 deletions(-)
delete mode 100644 django_airavata/settings_local_seagrid.py
[airavata-django-portal] 02/02: Adding `settings_local*.py` to
.gitignore
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 31b7e80fcf3909991dc71ec0155500f0c87e8ca1
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri May 31 16:35:54 2019 -0400
Adding `settings_local*.py` to .gitignore
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 926e56a..5124db2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.pyc
db.sqlite3
settings_local.py
+settings_local*.py
.DS_Store
node_modules
.idea/
[airavata-django-portal] 01/02: Removing unintentional committed
file
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 7d4b23aa448977d55cfda29ec5e26888f3504c37
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri May 31 16:34:09 2019 -0400
Removing unintentional committed file
---
django_airavata/settings_local_seagrid.py | 147 ------------------------------
1 file changed, 147 deletions(-)
diff --git a/django_airavata/settings_local_seagrid.py b/django_airavata/settings_local_seagrid.py
deleted file mode 100644
index c193a3a..0000000
--- a/django_airavata/settings_local_seagrid.py
+++ /dev/null
@@ -1,147 +0,0 @@
-"""
-Override default Django settings for a particular instance.
-
-Copy this file to settings_local.py and modify as appropriate. This file will
-be imported into settings.py last of all so settings in this file override any
-defaults specified in settings.py.
-"""
-
-import os
-
-from . import webpack_loader_util
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-# Django configuration
-
-DEBUG = True
-ALLOWED_HOSTS = ['localhost']
-
-# Django - Email Settings
-# Uncomment and specify the following for sending emails (default email backend
-# just prints to the console)
-# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# EMAIL_HOST = 'smtp.gmail.com'
-# EMAIL_PORT = 587
-# EMAIL_HOST_USER = 'pga.airavata@gmail.com'
-# EMAIL_HOST_PASSWORD = 'airavata12'
-# EMAIL_USE_TLS = True
-ADMINS = [('Marcus Christie', 'machrist@iu.edu')]
-SERVER_EMAIL = 'pga.airavata@gmail.com'
-
-# Keycloak Configuration
-KEYCLOAK_CLIENT_ID = 'pga'
-KEYCLOAK_CLIENT_SECRET = '5d2dc66a-f54e-4fa9-b78f-80d33aa862c1'
-KEYCLOAK_AUTHORIZE_URL = 'https://iamdev.scigap.org/auth/realms/seagrid/protocol/openid-connect/auth'
-KEYCLOAK_TOKEN_URL = 'https://iamdev.scigap.org/auth/realms/seagrid/protocol/openid-connect/token'
-KEYCLOAK_USERINFO_URL = 'https://iamdev.scigap.org/auth/realms/seagrid/protocol/openid-connect/userinfo'
-KEYCLOAK_LOGOUT_URL = 'https://iamdev.scigap.org/auth/realms/seagrid/protocol/openid-connect/logout'
-KEYCLOAK_CA_CERTFILE = os.path.join(
- BASE_DIR,
- "django_airavata",
- "resources",
- "incommon_rsa_server_ca.pem")
-KEYCLOAK_VERIFY_SSL = True
-
-AUTHENTICATION_OPTIONS = {
- 'password': {
- 'name': 'SEAGrid'
- },
- 'external': [
- {
- 'idp_alias': 'oidc',
- 'name': 'CILogon',
- },
- # {
- # 'idp_alias': 'iucas',
- # 'name': 'IU CAS',
- # },
- ]
-}
-
-# Airavata API Configuration
-GATEWAY_ID = 'seagrid'
-AIRAVATA_API_HOST = 'apidev.scigap.org'
-AIRAVATA_API_PORT = 9930
-AIRAVATA_API_SECURE = True
-# AIRAVATA_API_HOST = 'localhost'
-# AIRAVATA_API_PORT = 8930
-# AIRAVATA_API_SECURE = False
-GATEWAY_DATA_STORE_RESOURCE_ID = 'pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e'
-GATEWAY_DATA_STORE_DIR = '/tmp/experiment-data-dir'
-GATEWAY_DATA_STORE_HOSTNAME = 'localhost'
-
-# Profile Service Configuration
-PROFILE_SERVICE_HOST = AIRAVATA_API_HOST
-PROFILE_SERVICE_PORT = 8962
-PROFILE_SERVICE_SECURE = False
-
-# Sharing API Configuration
-SHARING_API_HOST = AIRAVATA_API_HOST
-SHARING_API_PORT = 7878
-SHARING_API_SECURE = False
-
-# Portal settings
-PORTAL_TITLE = 'Django Airavata Gateway'
-
-# Logging configuration
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'formatters': {
- 'verbose': {
- 'format': '[%(asctime)s %(name)s:%(lineno)d %(levelname)s] %(message)s'
- },
- },
- 'filters': {
- 'require_debug_true': {
- '()': 'django.utils.log.RequireDebugTrue',
- },
- },
- 'handlers': {
- 'console': {
- 'filters': ['require_debug_true'],
- 'class': 'logging.StreamHandler',
- 'formatter': 'verbose',
- 'level': 'DEBUG',
- },
- # 'file': {
- # 'class': 'logging.FileHandler',
- # 'filename': 'django_airavata.log',
- # 'formatter': 'verbose',
- # },
- },
- 'loggers': {
- 'django': {
- 'handlers': ['console'],
- 'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
- },
- 'airavata': {
- 'handlers': ['console'],
- 'level': 'DEBUG',
- },
- 'django_airavata': {
- 'handlers': ['console'],
- 'level': 'DEBUG',
- },
- 'django_airavata.utils': {
- 'handlers': ['console'],
- 'level': 'DEBUG',
- },
- 'thrift_connector': {
- 'handlers': ['console'],
- 'level': 'DEBUG',
- },
- 'simccs_maptool': {
- 'handlers': ['console'],
- 'level': 'DEBUG',
- },
- # 'requests_oauthlib': {
- # 'handlers': ['console'],
- # 'level': 'DEBUG',
- # },
- },
-}
-
-# WEBPACK_LOADER = webpack_loader_util.create_webpack_loader_config("/tmp")