[UI] Optional trust of all SSL Certificates

[validation.git] / ui / src / main / java / org / akraino / validation / ui / conf / ExternalAppConfig.java

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 (file)
--- 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);
     }