This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 10103baac62360c4c0e08a4f800248feeba0e657 Author: yasithdev <[email protected]> AuthorDate: Tue Jul 15 17:13:21 2025 -0500 set default regserver hostname to localhost remove unused properties. --- .devcontainer/docker-compose-alt.yml | 22 ++----------- .devcontainer/docker-compose.yml | 4 +-- README.md | 10 +++--- .../apache/airavata/api/server/util/Constants.java | 3 -- .../airavata/monitor/email/EmailBasedMonitor.java | 2 +- .../registry/api/service/util/Constants.java | 1 - .../profile/commons/utils/JPAConstants.java | 5 --- .../service/profile/commons/utils/Utils.java | 19 ------------ .../core/impl/TenantManagementKeycloakImpl.java | 5 --- .../service/security/KeyCloakSecurityManager.java | 5 --- .../src/main/resources/airavata-server.properties | 8 ++--- .../templates/airavata-server.properties.j2 | 32 +------------------ .../controller/airavata-server.properties.j2 | 1 - .../parser-wm/airavata-server.properties.j2 | 1 - .../participant/airavata-server.properties.j2 | 8 ----- .../post-wm/airavata-server.properties.j2 | 1 - .../templates/pre-wm/airavata-server.properties.j2 | 1 - dev-tools/ansible/roles/job_monitor/tasks/main.yml | 4 +-- .../email-monitor/airavata-server.properties.j2 | 1 - .../realtime-monitor/airavata-server.properties.j2 | 1 - .../templates/airavata-server.properties.j2 | 34 --------------------- .../deployment-scripts/distribution_update.sh | 9 ++++-- keystores/aes.p12 | Bin 409 -> 409 bytes .../airavata/ide/integration/APIServerStarter.java | 2 +- 24 files changed, 25 insertions(+), 154 deletions(-) diff --git a/.devcontainer/docker-compose-alt.yml b/.devcontainer/docker-compose-alt.yml index d1e1e919f2..50ff2937cc 100644 --- a/.devcontainer/docker-compose-alt.yml +++ b/.devcontainer/docker-compose-alt.yml @@ -56,12 +56,9 @@ services: - registry.jdbc.password=123456 - start.derby.server.mode=false - validationQuery=SELECT 1 from CONFIGURATION - - cache.enable=false - - jpa.cache.size=-1 - enable.sharing=true - default.registry.user=default-admin - default.registry.password=123456 - - default.registry.password.hash.method=SHA - default.registry.gateway=default - default.registry.oauth.client.id=pga - default.registry.oauth.client.secret=9790c8c4-7d9b-4ccc-a820-ca5aac38d2ad @@ -91,16 +88,10 @@ services: - sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer - sharing.registry.server.host=0.0.0.0 - sharing.registry.server.port=7878 - - sharing.tls.enabled=false - - userprofile.mongodb.host=localhost - - userprofile.mongodb.port=27017 - apiserver.class=org.apache.airavata.api.server.AiravataAPIServer - - apiserver.name=apiserver-node0 - apiserver.host=0.0.0.0 - apiserver.port=8930 - - apiserver.min.threads=50 - orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer - - orchestrator.server.name=orchestrator-node0 - orchestrator.server.host=0.0.0.0 - orchestrator.server.port=8940 - orchestrator.server.min.threads=50 @@ -108,16 +99,12 @@ services: - enable.validation=true - host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler - regserver=org.apache.airavata.registry.api.service.RegistryAPIServer - - regserver.server.name=regserver-node0 - - regserver.server.host=0.0.0.0 + - regserver.server.host=localhost - regserver.server.port=8970 - regserver.server.min.threads=50 - - workflowserver=org.apache.airavata.api.server.WorkflowServer - - enactment.thread.pool.size=10 - job.notification.enable=true - job.notification.emailids= - - job.notification.flags=abe - - credential.store.keystore.url=/opt/keystores/airavata.p12 + - credential.store.keystore.url=/opt/keystores/airavata.sym.p12 - credential.store.keystore.alias=airavata - credential.store.keystore.password=airavata - credential.store.jdbc.url=jdbc:mariadb://db:3306/credential_store @@ -136,16 +123,11 @@ services: - prefetch.count=200 - embedded.zk=false - zookeeper.server.connection=zookeeper:2181 - - zookeeper.timeout=30000 - - api.secured=true - security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager - TLS.enabled=true - - TLS.api.server.port=9930 - TLS.client.timeout=10000 - keystore.path=/opt/keystores/airavata.p12 - keystore.password=airavata - - trust.store=/opt/keystores/airavata.p12 - - trust.store.password=airavata - authz.cache.enabled=true - authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager - in.memory.cache.size=1000 diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index aa79808d09..ec91fabdf5 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -127,8 +127,8 @@ services: container_name: proxy restart: always volumes: - - ../vault/server.key:/vault/server.key:ro - - ../vault/server.crt:/vault/server.crt:ro + - ../vault.local/server.key:/vault/server.key:ro + - ../vault.local/server.crt:/vault/server.crt:ro - ./proxy/nginx.conf:/etc/nginx/nginx.conf:ro - ./proxy/http.conf:/etc/nginx/conf.d/http.conf:ro - ./proxy/stream.conf:/etc/nginx/conf.d/stream.conf:ro diff --git a/README.md b/README.md index fa267b67e3..1535840944 100644 --- a/README.md +++ b/README.md @@ -202,10 +202,10 @@ distribution ├── services_up.sh └── vault ├── airavata-server.properties - ├── airavata.p12 + ├── airavata.sym.p12 ├── application-agent-service.yml ├── application-research-service.yml - ├── email-config.yaml + ├── email-config.yml └── log4j2.xml 2 directories, 16 files @@ -213,11 +213,13 @@ distribution **What's in the vault?** -* `airavata.p12` - contains the keys used to secure SSH credentials, etc. -* `email-config.yaml` - contains the email addresses observed by the email monitor. +* `airavata.sym.p12` - contains the symmetric key used to secure stored credentials. * `airavata-server.properties` - config file for the airavata api server. * `application-agent-service.yml` - config file for the airavata agent service. +* `application-file-server.yml` - config file for the airavata file server. * `application-research-service.yml` - config file for the airavata research service. +* `application-restproxy.properties` - config file for the airavata rest proxy. +* `email-config.yml` - contains the email addresses observed by the email monitor. * `log4j2.xml` - contains the Log4j configuration for all airavata services. Next, start the services using the deployment scripts. diff --git a/airavata-api/src/main/java/org/apache/airavata/api/server/util/Constants.java b/airavata-api/src/main/java/org/apache/airavata/api/server/util/Constants.java index 31ed280639..b0e8ef56a7 100644 --- a/airavata-api/src/main/java/org/apache/airavata/api/server/util/Constants.java +++ b/airavata-api/src/main/java/org/apache/airavata/api/server/util/Constants.java @@ -22,8 +22,5 @@ package org.apache.airavata.api.server.util; public class Constants { public static final String API_SERVER_PORT = "apiserver.port"; public static final String API_SERVER_HOST = "apiserver.host"; - public static final String API_SERVER_NAME = "apiserver.name"; - public static final String WORKFLOW_SERVER_PORT = "workflow.server.port"; - public static final String WORKFLOW_SERVER_HOST = "workflow.server.host"; public static final String API_SERVER_MIN_THREADS = "apiserver.server.min.threads"; } diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java b/airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java index 1bfb591e56..5c4aecede3 100644 --- a/airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java +++ b/airavata-api/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java @@ -87,7 +87,7 @@ public class EmailBasedMonitor extends AbstractMonitor implements Runnable { private void loadContext() throws Exception { Yaml yaml = new Yaml(); InputStream emailConfigStream = - ApplicationSettings.loadFile("email-config.yaml").openStream(); + ApplicationSettings.loadFile("email-config.yml").openStream(); Object load = yaml.load(emailConfigStream); if (load == null) { diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java index cfa5bee241..fa9510f845 100644 --- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java +++ b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java @@ -26,7 +26,6 @@ import org.apache.airavata.common.utils.DBEventService; public class Constants { public static final String REGISTRY_SERVER_PORT = "regserver.server.port"; public static final String REGISTRY_SERVER_HOST = "regserver.server.host"; - public static final String REGISTRY_SERVER_NAME = "regserver.server.name"; public static final String REGISTRY_SERVER_MIN_THREADS = "regserver.server.min.threads"; public static final List<String> DB_EVENT_SUBSCRIBERS = new ArrayList<String>() { diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java index 2488c13556..2663b9f902 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java @@ -24,10 +24,5 @@ public class JPAConstants { public static final String KEY_JDBC_USER = "profile.service.jdbc.user"; public static final String KEY_JDBC_PASSWORD = "profile.service.jdbc.password"; public static final String KEY_JDBC_DRIVER = "profile.service.jdbc.driver"; - - // TODO: is this needed? - public static final String KEY_DERBY_START_ENABLE = "profile.service.start.derby.server.mode"; public static final String VALIDATION_QUERY = "profile.service.validationQuery"; - public static final String JPA_CACHE_SIZE = "profile.service.jpa.cache.size"; - public static final String ENABLE_CACHING = "profile.service.cache.enable"; } diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java index 3d79639788..6fe32a38ba 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java @@ -61,25 +61,6 @@ public class Utils { } } - public static int getJPACacheSize() { - try { - String cache = ServerSettings.getSetting(JPAConstants.JPA_CACHE_SIZE, "5000"); - return Integer.parseInt(cache); - } catch (Exception e) { - logger.error(e.getMessage(), e); - return -1; - } - } - - public static String isCachingEnabled() { - try { - return ServerSettings.getSetting(JPAConstants.ENABLE_CACHING, "true"); - } catch (Exception e) { - logger.error(e.getMessage(), e); - return "true"; - } - } - public static String getJDBCUser() { try { return ServerSettings.getSetting(JPAConstants.KEY_JDBC_USER); diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java index bdf85bd4aa..d9b4fcf1e1 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java @@ -873,11 +873,6 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface { public static void main(String[] args) throws IamAdminServicesException, ApplicationSettingsException { TenantManagementKeycloakImpl tenantManagementKeycloak = new TenantManagementKeycloakImpl(); - // If testing with self-signed certificate, load certificate into - // modules/configuration/server/src/main/resources/airavata.p12 and uncomment the following - // ServerSettings.setSetting("trust.store", - // "./modules/configuration/server/src/main/resources/airavata.p12"); - // ServerSettings.setSetting("trust.store.password", "airavata"); ServerSettings.setSetting("iam.server.url", ""); String accessToken = ""; String tenantId = ""; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java index 489b6a4f1b..f368e83016 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java @@ -172,11 +172,6 @@ public class KeyCloakSecurityManager implements AiravataSecurityManager { } public static void main(String[] args) throws AiravataSecurityException, ApplicationSettingsException, IOException { - // If testing with self-signed certificate, load certificate into - // modules/configuration/server/src/main/resources/airavata.p12 and uncomment the following - // ServerSettings.setSetting("trust.store", - // "./modules/configuration/server/src/main/resources/airavata.p12"); - // ServerSettings.setSetting("trust.store.password", "airavata"); KeyCloakSecurityManager keyCloakSecurityManager = new KeyCloakSecurityManager(); final String tokenURL = "..."; final String clientId = "..."; diff --git a/airavata-api/src/main/resources/airavata-server.properties b/airavata-api/src/main/resources/airavata-server.properties index 7da7ff8ebf..074f0cfd81 100644 --- a/airavata-api/src/main/resources/airavata-server.properties +++ b/airavata-api/src/main/resources/airavata-server.properties @@ -23,7 +23,6 @@ api.server.monitoring.enabled=true api.server.monitoring.host=0.0.0.0 api.server.monitoring.port=9097 apiserver.host=0.0.0.0 -apiserver.name=apiserver-node0 apiserver.port=8930 apiserver.class=org.apache.airavata.api.server.AiravataAPIServer @@ -41,7 +40,7 @@ credential.store.jdbc.password=123456 credential.store.jdbc.url=jdbc:mariadb://airavata.host:13306/credential_store credential.store.jdbc.user=airavata credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION -credential.store.server.host=0.0.0.0 +credential.store.server.host=api.gateway.cybershuttle.org credential.store.server.port=8960 credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer @@ -151,9 +150,8 @@ registry.jdbc.password=123456 registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog registry.jdbc.user=airavata -regserver.server.host=0.0.0.0 +regserver.server.host=localhost regserver.server.min.threads=50 -regserver.server.name=regserver-node0 regserver.server.port=8970 regserver=org.apache.airavata.registry.api.service.RegistryAPIServer @@ -182,7 +180,7 @@ TLS.client.timeout=10000 TLS.enabled=false keystore.path=keystores/airavata.p12 keystore.password=airavata -credential.store.keystore.url=keystores/airavata.p12 +credential.store.keystore.url=keystores/airavata.sym.p12 credential.store.keystore.password=airavata credential.store.keystore.alias=airavata authz.cache.enabled=true diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 index 3cbf5b794c..18680aabd7 100644 --- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 @@ -40,23 +40,15 @@ registry.jdbc.password={{ db_password }} #FIXME: Probably the following property should be removed. start.derby.server.mode=false validationQuery=SELECT 1 from CONFIGURATION -cache.enable=false -jpa.cache.size=-1 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true enable.sharing={{enable_sharing}} # Properties for default user mode default.registry.user={{ default_registry_user }} default.registry.password={{ default_registry_password }} -default.registry.password.hash.method=SHA default.registry.gateway={{ default_gateway }} super.tenant.gatewayId={{ default_gateway }} -# Properties for cluster status monitoring -# cluster status monitoring job repeat time in seconds -cluster.status.monitoring.enable=false -cluster.status.monitoring.repeat.time=18000 - ########################################################################### # Application Catalog DB Configuration ########################################################################### @@ -128,16 +120,13 @@ sharing.registry.server.port={{ sharing_registry_port }} # API Server Configurations ########################################################################### apiserver.class=org.apache.airavata.api.server.AiravataAPIServer -apiserver.name={{ api_server_name }} apiserver.host={{ api_server_host }} apiserver.port={{ api_server_port }} -apiserver.min.threads=50 ########################################################################### # Orchestrator Server Configurations ########################################################################### orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer -orchestrator.server.name={{ orchestrator_name }} orchestrator.server.host={{ orchestrator_host }} orchestrator.server.port={{ orchestrator_port }} orchestrator.server.min.threads=50 @@ -149,23 +138,10 @@ host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostSchedul # Registry Server Configurations ########################################################################### regserver=org.apache.airavata.registry.api.service.RegistryAPIServer -regserver.server.name={{registry_name}} regserver.server.host={{registry_host}} regserver.server.port={{registry_port}} regserver.server.min.threads=50 - -########################################################################### -# Airavata Workflow Interpreter Configurations -########################################################################### -workflowserver=org.apache.airavata.api.server.WorkflowServer -enactment.thread.pool.size=10 - -#to define custom workflow parser user following property -#workflow.parser=org.apache.airavata.workflow.core.parser.AiravataWorkflowBuilder - - - ########################################################################### # Job Scheduler can send informative email messages to you about the status of your job. # Specify a string which consists of either the single character "n" (no mail), or one or more @@ -176,7 +152,6 @@ enactment.thread.pool.size=10 job.notification.enable=true #Provide comma separated email ids as a string if more than one job.notification.emailids= -job.notification.flags=abe ########################################################################### # Credential Store module Configuration @@ -249,24 +224,18 @@ prefetch.count=200 ########################################################################### embedded.zk=false zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 ######################################################################## ## API Security Configuration ######################################################################## -api.secured={{ api_secured }} security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager ### TLS related configuration #### TLS.enabled={{ tls_enable }} -TLS.api.server.port={{ api_server_tls_port }} TLS.client.timeout=10000 #### keystore configuration #### keystore.path={{ keystores_location }}/{{ keystore_src_path | basename }} keystore.password={{ keystore_passwd }} {% if client_truststore_src_path is defined %} -#### trust store configuration #### -trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }} -trust.store.password={{ client_truststore_passwd }} {% endif %} #### authorization cache related configuration #### authz.cache.enabled=true @@ -316,6 +285,7 @@ api.server.monitoring.port={{ api_server_monitoring_port }} # Metascheduler And Compute Resource Monitoring Configuration ########################################################################### cluster.status.monitoring.enable={{ cluster_monitoring_enabled }} +cluster.status.monitoring.repeat.time=18000 compute.resource.selection.policy.class={{ metascheduler_resource_selection_policy_class }} metascheduler.gateway={{ metascheduler_gateway }} metascheduler.group.resource.profile={{ metascheduler_group_resource_profile }} diff --git a/dev-tools/ansible/roles/helix_setup/templates/controller/airavata-server.properties.j2 b/dev-tools/ansible/roles/helix_setup/templates/controller/airavata-server.properties.j2 index cc58bd68f1..0ddf14aeaa 100644 --- a/dev-tools/ansible/roles/helix_setup/templates/controller/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/helix_setup/templates/controller/airavata-server.properties.j2 @@ -28,4 +28,3 @@ helix.controller.name={{ helix_controller_name }} ########################################################################### embedded.zk=false zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 \ No newline at end of file diff --git a/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2 b/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2 index 649816abce..6e78323085 100644 --- a/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2 @@ -46,7 +46,6 @@ prefetch.count=200 # Zookeeper Server Configuration ########################################################################### zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 ########################################################################### # Data Parser Configurations diff --git a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 index d652a69712..c9710f3f03 100644 --- a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 @@ -67,7 +67,6 @@ prefetch.count=200 # Zookeeper Server Configuration ########################################################################### zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 ########################################################################### # Data Parser Configurations @@ -100,13 +99,6 @@ max.archive.size={{ max_archive_size }} thrift.client.pool.abandoned.removal.enabled={{ thrift_client_pool_abandoned_removal_enabled }} thrift.client.pool.abandoned.removal.logged={{ thrift_client_pool_abandoned_removal_logged }} -########################################################################### -# Usage Reporting Configuration -########################################################################### - -usage.reporting.key={{ usage_reporting_key }} -usage.reporting.endpoint=https://xsede-xdcdb-api.xsede.org/gateway/v2/job_attributes - ########################################################################### # Platform Monitoring Configuration ########################################################################### diff --git a/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2 b/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2 index 43aa33f2d2..5e7b8026e3 100644 --- a/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2 @@ -50,7 +50,6 @@ prefetch.count=200 # Zookeeper Server Configuration ########################################################################### zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 ########################################################################### # ThriftClientPool Configuration diff --git a/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2 b/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2 index 21400ae523..303079fd49 100644 --- a/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2 @@ -47,7 +47,6 @@ prefetch.count=200 # Zookeeper Server Configuration ########################################################################### zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 ########################################################################### # ThriftClientPool Configuration diff --git a/dev-tools/ansible/roles/job_monitor/tasks/main.yml b/dev-tools/ansible/roles/job_monitor/tasks/main.yml index a49f3adb3b..91579631c4 100644 --- a/dev-tools/ansible/roles/job_monitor/tasks/main.yml +++ b/dev-tools/ansible/roles/job_monitor/tasks/main.yml @@ -75,8 +75,8 @@ - { name: realtime-monitor, dir: "{{ realtime_monitor_version }}" } - name: Copy email-monitor configuration file - template: src=email-monitor/email-config.yaml.j2 - dest="{{ helix_dir }}/{{ email_monitor_version }}/conf/email-config.yaml" + template: src=email-monitor/email-config.yml + dest="{{ helix_dir }}/{{ email_monitor_version }}/conf/email-config.yml" owner={{ user }} group={{ group }} mode="u=rw,g=r,o=r" diff --git a/dev-tools/ansible/roles/job_monitor/templates/email-monitor/airavata-server.properties.j2 b/dev-tools/ansible/roles/job_monitor/templates/email-monitor/airavata-server.properties.j2 index cfda787ec0..fde8e1c495 100644 --- a/dev-tools/ansible/roles/job_monitor/templates/email-monitor/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/job_monitor/templates/email-monitor/airavata-server.properties.j2 @@ -32,7 +32,6 @@ job.monitor.broker.topic={{ job_monitor_broker_topic }} job.monitor.email.publisher.id={{ email_job_monitor_broker_publisher }} zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 email.expiration.minutes=60 ########################################################################### diff --git a/dev-tools/ansible/roles/job_monitor/templates/realtime-monitor/airavata-server.properties.j2 b/dev-tools/ansible/roles/job_monitor/templates/realtime-monitor/airavata-server.properties.j2 index d1d14f98c2..23509ec382 100644 --- a/dev-tools/ansible/roles/job_monitor/templates/realtime-monitor/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/job_monitor/templates/realtime-monitor/airavata-server.properties.j2 @@ -17,7 +17,6 @@ # zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 kafka.broker.url={{ job_monitor_broker_url }} realtime.monitor.broker.consumer.group={{realtime_monitor_broker_consumer_group }} diff --git a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 index cc64b5ccd6..6a60bc21ce 100644 --- a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 @@ -40,8 +40,6 @@ registry.jdbc.password={{ db_password }} #FIXME: Probably the following property should be removed. start.derby.server.mode=false validationQuery=SELECT 1 from CONFIGURATION -cache.enable=false -jpa.cache.size=-1 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true enable.sharing={{enable_sharing}} @@ -110,13 +108,6 @@ sharingcatalog.jdbc.user={{ db_user }} sharingcatalog.jdbc.password={{ db_password }} sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION -########################################################################### -# User Profile MongoDB Configuration -########################################################################### -userprofile.mongodb.host=localhost -userprofile.mongodb.port=27017 - - ########################################################################### # Server module Configuration ########################################################################### @@ -124,21 +115,17 @@ userprofile.mongodb.port=27017 #This is obsolete property with new script files. #servers=credentialstore,apiserver,orchestrator - ########################################################################### # API Server Configurations ########################################################################### apiserver.class=org.apache.airavata.api.server.AiravataAPIServer -apiserver.name={{ api_server_name }} apiserver.host={{ api_server_host }} apiserver.port={{ api_server_port }} -apiserver.min.threads=50 ########################################################################### # Orchestrator Server Configurations ########################################################################### orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer -orchestrator.server.name={{ orchestrator_name }} orchestrator.server.host={{ orchestrator_host }} orchestrator.server.port={{ orchestrator_port }} orchestrator.server.min.threads=50 @@ -149,7 +136,6 @@ enable.validation=true # Registry Server Configurations ########################################################################### regserver=org.apache.airavata.registry.api.service.RegistryAPIServer -regserver.server.name={{registry_name}} regserver.server.host={{registry_host}} regserver.server.port={{registry_port}} regserver.server.min.threads=50 @@ -164,19 +150,6 @@ gfac.server.port={{ gfac_port }} gfac.thread.pool.size=50 host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler - - -########################################################################### -# Airavata Workflow Interpreter Configurations -########################################################################### -workflowserver=org.apache.airavata.api.server.WorkflowServer -enactment.thread.pool.size=10 - -#to define custom workflow parser user following property -#workflow.parser=org.apache.airavata.workflow.core.parser.AiravataWorkflowBuilder - - - ########################################################################### # Job Scheduler can send informative email messages to you about the status of your job. # Specify a string which consists of either the single character "n" (no mail), or one or more @@ -187,7 +160,6 @@ enactment.thread.pool.size=10 job.notification.enable=true #Provide comma separated email ids as a string if more than one job.notification.emailids= -job.notification.flags=abe ########################################################################### # Credential Store module Configuration @@ -260,23 +232,17 @@ prefetch.count=200 ########################################################################### embedded.zk=false zookeeper.server.connection={{ zookeeper_connection_url }} -zookeeper.timeout=30000 ######################################################################## ## API Security Configuration ######################################################################## -api.secured={{ api_secured }} security.manager.class=org.apache.airavata.api.server.security.DefaultAiravataSecurityManager ### TLS related configuration #### TLS.enabled={{ tls_enable }} -TLS.api.server.port={{ api_server_tls_port }} TLS.client.timeout=10000 #### keystore configuration #### keystore.path={{ keystores_location }}/{{ keystore }} keystore.password={{ keystore_passwd }} -#### trust store configuration #### -trust.store={{ keystores_location }}/{{ client_truststore }} -trust.store.password={{ client_truststore_passwd }} #### remote authorization server url #### remote.oauth.authorization.server=https://idp.scigap.org:9443/services/ #### xacml based authorization policy #### diff --git a/dev-tools/deployment-scripts/distribution_update.sh b/dev-tools/deployment-scripts/distribution_update.sh index 35ed252bf2..39fef9fa06 100644 --- a/dev-tools/deployment-scripts/distribution_update.sh +++ b/dev-tools/deployment-scripts/distribution_update.sh @@ -35,24 +35,29 @@ log "REST proxy updated." # ================================ # Update the config files # ================================ +mkdir -p ./apache-airavata-api-server-0.21-SNAPSHOT/conf/keystores/ cp vault/airavata-server.properties ./apache-airavata-api-server-0.21-SNAPSHOT/conf/airavata-server.properties cp vault/airavata.sym.p12 ./apache-airavata-api-server-0.21-SNAPSHOT/conf/keystores/airavata.sym.p12 -cp vault/email-config.yaml ./apache-airavata-api-server-0.21-SNAPSHOT/conf/email-config.yaml +cp vault/email-config.yml ./apache-airavata-api-server-0.21-SNAPSHOT/conf/email-config.yml cp vault/log4j2.xml ./apache-airavata-api-server-0.21-SNAPSHOT/conf/log4j2.xml log "API Server config files updated." +mkdir -p ./apache-airavata-agent-service-0.21-SNAPSHOT/conf cp vault/application-agent-service.yml ./apache-airavata-agent-service-0.21-SNAPSHOT/conf/application.yml cp vault/log4j2.xml ./apache-airavata-agent-service-0.21-SNAPSHOT/conf/log4j2.xml log "Agent Service config files updated." +mkdir -p ./apache-airavata-research-service-0.21-SNAPSHOT/conf cp vault/application-research-service.yml ./apache-airavata-research-service-0.21-SNAPSHOT/conf/application.yml cp vault/log4j2.xml ./apache-airavata-research-service-0.21-SNAPSHOT/conf/log4j2.xml log "Research Service config files updated." +mkdir -p ./apache-airavata-file-server-0.21-SNAPSHOT/conf cp vault/application-file-server.properties ./apache-airavata-file-server-0.21-SNAPSHOT/conf/application.properties cp vault/log4j2.xml ./apache-airavata-file-server-0.21-SNAPSHOT/conf/log4j2.xml log "File Service config files updated." +mkdir -p ./apache-airavata-restproxy-0.21-SNAPSHOT/conf cp vault/application-restproxy.properties ./apache-airavata-restproxy-0.21-SNAPSHOT/conf/application.properties cp vault/log4j2.xml ./apache-airavata-restproxy-0.21-SNAPSHOT/conf/log4j2.xml -log "REST proxy config files updated." \ No newline at end of file +log "REST proxy config files updated." diff --git a/keystores/aes.p12 b/keystores/aes.p12 index d5c5e2b864..731f94add0 100644 Binary files a/keystores/aes.p12 and b/keystores/aes.p12 differ diff --git a/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/APIServerStarter.java b/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/APIServerStarter.java index 7b5e6a17ec..1445c53877 100644 --- a/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/APIServerStarter.java +++ b/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/APIServerStarter.java @@ -29,7 +29,7 @@ import org.apache.airavata.sharing.registry.server.SharingRegistryServer; public class APIServerStarter { - public static void main(String args[]) throws Exception { + public static void main(String[] args) throws Exception { DBEventManagerRunner dbEventManagerRunner = new DBEventManagerRunner(); RegistryAPIServer registryAPIServer = new RegistryAPIServer(); CredentialStoreServer credentialStoreServer = new CredentialStoreServer();
