X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fconf%2FExternalAppConfig.java;h=c4a92c0e80111772bd59570cc9c128757d58f5b5;hb=291b699220dc09c94211a56575b92e71056f261c;hp=3317260969fc5e4ed7ce402f418ea9a888bf16ff;hpb=e27d588d5911a8f401583630a2521c78cdc16013;p=validation.git diff --git a/ui/src/main/java/org/akraino/validation/ui/conf/ExternalAppConfig.java b/ui/src/main/java/org/akraino/validation/ui/conf/ExternalAppConfig.java index 3317260..c4a92c0 100644 --- a/ui/src/main/java/org/akraino/validation/ui/conf/ExternalAppConfig.java +++ b/ui/src/main/java/org/akraino/validation/ui/conf/ExternalAppConfig.java @@ -113,10 +113,10 @@ public class ExternalAppConfig extends AppConfig implements Configurable { ComboPooledDataSource dataSource = new ComboPooledDataSource(); try { dataSource.setDriverClass(SystemProperties.getProperty(SystemProperties.DB_DRIVER)); - dataSource.setJdbcUrl("jdbc:mariadb://" + System.getenv("DB_IP_PORT") + "/" + dataSource.setJdbcUrl("jdbc:mysql://" + System.getenv("DB_IP_PORT") + "/" + PortalApiProperties.getProperty("akraino_database_name")); - dataSource.setUser(SystemProperties.getProperty(SystemProperties.DB_USERNAME)); - String password = System.getenv("MARIADB_AKRAINO_PASSWORD"); + dataSource.setUser(System.getenv("MYSQL_USER")); + String password = System.getenv("MYSQL_PASSWORD"); if (SystemProperties.containsProperty(SystemProperties.DB_ENCRYPT_FLAG)) { String encryptFlag = SystemProperties.getProperty(SystemProperties.DB_ENCRYPT_FLAG); if (encryptFlag != null && encryptFlag.equalsIgnoreCase("true")) { @@ -169,7 +169,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable { @Override public void addInterceptors(InterceptorRegistry registry) { super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm", "login", "/login.htm", - "/api*", "/single_signon.htm", "/single_signon", "logout", "/logout.htm"); + "/api*", "/single_signon.htm", "/single_signon", "logout", "/logout.htm", "/process_csp"); super.addInterceptors(registry); }