Created
September 27, 2024 04:17
-
-
Save gamerson/9cee2f2e4a9ed02110a34458b7d8e525 to your computer and use it in GitHub Desktop.
dxpc patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c71eeb13f6e78816062e0db20a41168686aa4788 Mon Sep 17 00:00:00 2001 | |
From: Gregory Amerson <[email protected]> | |
Date: Thu, 26 Sep 2024 23:16:20 -0500 | |
Subject: [PATCH] DXPC Patch | |
--- | |
liferay/Dockerfile.ext | 5 +- | |
liferay/LCP.json | 7 +- | |
...uration.PortalK8sAgentConfiguration.config | 6 + | |
...guration.OpenIdConnectConfiguration.config | 2 + | |
.../WEB-INF/classes/META-INF/LXClayout.json | 70 ++++++ | |
.../classes/META-INF/portal-log4j-ext.xml | 216 ++++++++++++++++++ | |
liferay/configs/dev/portal-ext.properties | 6 +- | |
webserver/LCP.json | 6 +- | |
webserver/configs/dev/conf.d/liferay.conf | 3 - | |
9 files changed, 312 insertions(+), 9 deletions(-) | |
create mode 100644 liferay/configs/common/osgi/configs/com.liferay.portal.k8s.agent.configuration.PortalK8sAgentConfiguration.config | |
create mode 100644 liferay/configs/common/osgi/configs/com.liferay.portal.security.sso.openid.connect.configuration.OpenIdConnectConfiguration.config | |
create mode 100644 liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/LXClayout.json | |
create mode 100644 liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/portal-log4j-ext.xml | |
diff --git a/liferay/Dockerfile.ext b/liferay/Dockerfile.ext | |
index 6fafa2e..68a0742 100644 | |
--- a/liferay/Dockerfile.ext | |
+++ b/liferay/Dockerfile.ext | |
@@ -1 +1,4 @@ | |
-# Any instructions here will be appended to the end of the Dockerfile created by `createDockerfile`. | |
\ No newline at end of file | |
+RUN cd /opt/liferay/tomcat/webapps/ROOT/WEB-INF/shielded-container-lib && \ | |
+ curl -O https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-layout-template-json/2.17.2/log4j-layout-template-json-2.17.2.jar && \ | |
+ curl -O https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.13.2/jackson-core-2.13.2.jar && \ | |
+ curl -O https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.13.2/jackson-annotations-2.13.2.jar | |
\ No newline at end of file | |
diff --git a/liferay/LCP.json b/liferay/LCP.json | |
index 6fea233..ad00590 100644 | |
--- a/liferay/LCP.json | |
+++ b/liferay/LCP.json | |
@@ -2,7 +2,7 @@ | |
"kind": "Deployment", | |
"id": "liferay", | |
"image": "liferaycloud/liferay-dxp:7.4-5.8.2", | |
- "memory": 8192, | |
+ "memory": 4196, | |
"cpu": 8, | |
"scale": 1, | |
"ports": [ | |
@@ -36,7 +36,8 @@ | |
"publishNotReadyAddressesForCluster": false, | |
"env": { | |
"LCP_PROJECT_LIFERAY_CLUSTER_ENABLED": "true", | |
- "LIFERAY_JVM_OPTS": "-Xms2048m -Xmx6144m" | |
+ "LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_ORG_PERIOD_APACHE_PERIOD_FELIX_PERIOD_CONFIGADMIN_PERIOD_PLUGIN_PERIOD_INTERPOLATION_PERIOD_SECRETSDIR": "/opt/liferay/osgi/configs,/var/run/secrets/kubernetes.io/serviceaccount", | |
+ "LIFERAY_JVM_OPTS": "-Xms1024m -Xmx3072m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-opens=jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED" | |
}, | |
"dependencies": [ | |
"database", | |
@@ -51,7 +52,7 @@ | |
"memory": 4096, | |
"scale": 1, | |
"env": { | |
- "LIFERAY_JVM_OPTS": "-Xms1024m -Xmx3072m" | |
+ "LIFERAY_JVM_OPTS": "-Xms1024m -Xmx4196m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-opens=jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED" | |
} | |
} | |
} | |
diff --git a/liferay/configs/common/osgi/configs/com.liferay.portal.k8s.agent.configuration.PortalK8sAgentConfiguration.config b/liferay/configs/common/osgi/configs/com.liferay.portal.k8s.agent.configuration.PortalK8sAgentConfiguration.config | |
new file mode 100644 | |
index 0000000..487cb19 | |
--- /dev/null | |
+++ b/liferay/configs/common/osgi/configs/com.liferay.portal.k8s.agent.configuration.PortalK8sAgentConfiguration.config | |
@@ -0,0 +1,6 @@ | |
+apiServerHost="$[env:KUBERNETES_SERVICE_HOST]" | |
+apiServerPort="$[env:KUBERNETES_SERVICE_PORT]" | |
+apiServerSSL=b"true" | |
+caCertData="$[secret:ca.crt]" | |
+namespace="$[secret:namespace]" | |
+saToken="$[secret:token]" | |
\ No newline at end of file | |
diff --git a/liferay/configs/common/osgi/configs/com.liferay.portal.security.sso.openid.connect.configuration.OpenIdConnectConfiguration.config b/liferay/configs/common/osgi/configs/com.liferay.portal.security.sso.openid.connect.configuration.OpenIdConnectConfiguration.config | |
new file mode 100644 | |
index 0000000..16eaff4 | |
--- /dev/null | |
+++ b/liferay/configs/common/osgi/configs/com.liferay.portal.security.sso.openid.connect.configuration.OpenIdConnectConfiguration.config | |
@@ -0,0 +1,2 @@ | |
+companyWebId="${ADMIN_WEB_ID}" | |
+enabled=B"true" | |
\ No newline at end of file | |
diff --git a/liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/LXClayout.json b/liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/LXClayout.json | |
new file mode 100644 | |
index 0000000..2db63d6 | |
--- /dev/null | |
+++ b/liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/LXClayout.json | |
@@ -0,0 +1,70 @@ | |
+{ | |
+ "timestamp": { | |
+ "$resolver": "timestamp", | |
+ "pattern": { | |
+ "format": "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", | |
+ "timeZone": "UTC", | |
+ "locale": "en_US" | |
+ } | |
+ }, | |
+ "severity": { | |
+ "$resolver": "pattern", | |
+ "pattern": "%level{WARN=WARNING, TRACE=DEBUG, FATAL=EMERGENCY}", | |
+ "stackTraceEnabled": false | |
+ }, | |
+ "message": { | |
+ "$resolver": "pattern", | |
+ "pattern": "%m", | |
+ "stackTraceEnabled": false | |
+ }, | |
+ "logging.googleapis.com/labels": { | |
+ "$resolver": "mdc", | |
+ "stringified": true | |
+ }, | |
+ "logging.googleapis.com/sourceLocation": { | |
+ "file": { | |
+ "$resolver": "source", | |
+ "field": "fileName" | |
+ }, | |
+ "line": { | |
+ "$resolver": "source", | |
+ "field": "lineNumber" | |
+ }, | |
+ "function": { | |
+ "$resolver": "pattern", | |
+ "pattern": "%replace{%C.%M}{^\\?\\.$}{}", | |
+ "stackTraceEnabled": false | |
+ } | |
+ }, | |
+ "logging.googleapis.com/insertId": { | |
+ "$resolver": "counter", | |
+ "stringified": true | |
+ }, | |
+ "_exception": { | |
+ "class": { | |
+ "$resolver": "exception", | |
+ "field": "className" | |
+ }, | |
+ "message": { | |
+ "$resolver": "exception", | |
+ "field": "message" | |
+ }, | |
+ "stackTrace": { | |
+ "$resolver": "pattern", | |
+ "pattern": "%xEx{full}" | |
+ } | |
+ }, | |
+ "_thread": { | |
+ "$resolver": "thread", | |
+ "field": "name" | |
+ }, | |
+ "_threadContext": { | |
+ "$resolver": "mdc", | |
+ "flatten": false, | |
+ "stringified": false | |
+ }, | |
+ "_logger": { | |
+ "$resolver": "logger", | |
+ "field": "name" | |
+ } | |
+ } | |
diff --git a/liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/portal-log4j-ext.xml b/liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/portal-log4j-ext.xml | |
new file mode 100644 | |
index 0000000..8f7596b | |
--- /dev/null | |
+++ b/liferay/configs/common/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/portal-log4j-ext.xml | |
@@ -0,0 +1,216 @@ | |
+<?xml version="1.0"?> | |
+ | |
+<Configuration strict="true"> | |
+ <Appenders> | |
+ <Appender enabled="true" name="CONSOLE" target="SYSTEM_OUT" type="CompanyWebIdConsole"> | |
+ <JsonTemplateLayout eventTemplateUri="file:///${env:LIFERAY_HOME}/tomcat/webapps/ROOT/WEB-INF/classes/META-INF/LXClayout.json" stackTraceEnabled="true" maxStringLength="131072"/> | |
+ </Appender> | |
+ </Appenders> | |
+ | |
+ <Loggers> | |
+ <Logger level="WARN" name="aQute.bnd.osgi" /> | |
+ <Logger level="ERROR" name="com.browseengine.bobo" /> | |
+ <Logger level="ERROR" name="com.ecyrd.jspwiki" /> | |
+ <Logger level="ERROR" name="com.liferay" /> | |
+ <Logger level="INFO" name="com.liferay.bean.portlet" /> | |
+ <Logger level="WARN" name="com.liferay.mail.messaging" /> | |
+ <Logger level="ERROR" name="com.liferay.mail.service.impl.MailServiceImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.action.JSONServiceAction" /> | |
+ <Logger level="WARN" name="com.liferay.portal.action.LayoutAction" /> | |
+ <Logger level="WARN" name="com.liferay.portal.bean.BeanLocatorImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.bootstrap.ModuleFrameworkImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.bootstrap.log" /> | |
+ <Logger level="INFO" name="com.liferay.portal.cluster" /> | |
+ <Logger level="WARN" name="com.liferay.portal.configuration.ConfigurationImpl" /> | |
+ <Logger level="DEBUG" name="com.liferay.portal.convert" /> | |
+ <Logger level="INFO" name="com.liferay.portal.dao.db" /> | |
+ <Logger level="INFO" name="com.liferay.portal.dao.db.BaseDB" /> | |
+ <Logger level="INFO" name="com.liferay.portal.dao.init.DBInitUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.dao.jdbc.DataSourceFactoryImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.dao.jdbc.pool" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.dao.orm.common.SQLTransformer" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.dao.orm.hibernate.SessionFactoryImpl" /> | |
+ <Logger level="FATAL" name="com.liferay.portal.dao.orm.hibernate.VerifySessionFactoryWrapper" /> | |
+ <Logger level="WARN" name="com.liferay.portal.db.index.IndexUpdaterUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.deploy" /> | |
+ <Logger level="INFO" name="com.liferay.portal.deploy.hot.HookHotDeployListener" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.deploy.hot.PluginPackageHotDeployListener" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.deploy.hot.ThemeLoaderHotDeployListener" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.editor" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.EventsProcessor" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.GarbageCollectorAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.GlobalStartupAction" /> | |
+ <Logger level="DEBUG" name="com.liferay.portal.events.LogMemoryUsageAction" /> | |
+ <Logger level="DEBUG" name="com.liferay.portal.events.LogSessionIdAction" /> | |
+ <Logger level="DEBUG" name="com.liferay.portal.events.LogThreadCountAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.LoginPostAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.LoginPreAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.LogoutPostAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.LogoutPreAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.events.ServicePreAction" /> | |
+ <Logger level="INFO" name="com.liferay.portal.events.StartupAction" /> | |
+ <Logger level="INFO" name="com.liferay.portal.events.StartupHelperUtil" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.image.ImageToolImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.internal.servlet.MainServlet" /> | |
+ <Logger level="WARN" name="com.liferay.portal.json.jabsorb.serializer.LiferayJSONDeserializationWhitelist" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.bean.PortalBeanLocatorUtil" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.cluster" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.dao.orm.QueryUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.deploy" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.lar" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.messaging.config.DefaultMessagingConfigurator" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.model.Image" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.portlet.InvokerPortlet" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.portlet.RestrictPortletServletRequest" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.search.HitsOpenSearchImpl" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.security.auth.CompanyThreadLocal" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.servlet.PipingServletResponse" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.servlet.PluginContextListener" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.servlet.SecurePluginContextListener" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.servlet.ServletContextPool" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.servlet.ServletContextUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.servlet.ServletRequestUtil" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.servlet.ServletResponseUtil" /> | |
+ <Logger level="FATAL" name="com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilter" /> | |
+ <Logger level="FATAL" name="com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterHelper" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.upgrade" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.util.ClassUtil" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.kernel.util.JavaDetector" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.util.LoggingTimer" /> | |
+ <Logger level="WARN" name="com.liferay.portal.kernel.util.ReferenceRegistry" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.util.ServerDetector" /> | |
+ <Logger level="INFO" name="com.liferay.portal.kernel.util.ServiceProxyFactory" /> | |
+ <Logger level="WARN" name="com.liferay.portal.language.LanguageResources" /> | |
+ <Logger level="INFO" name="com.liferay.portal.license" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.model.DefaultModelHintsImpl" /> | |
+ <Logger level="WARN" name="com.liferay.portal.patcher.PatcherImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.plugin.PluginPackageUtil" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.pop" /> | |
+ <Logger level="WARN" name="com.liferay.portal.security" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.security.auth.EmailAddressGeneratorFactory" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.security.auth.EmailAddressValidatorFactory" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.security.auth.ScreenNameGeneratorFactory" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.security.auth.ScreenNameValidatorFactory" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.security.permission.AdvancedPermissionChecker" /> | |
+ <Logger level="WARN" name="com.liferay.portal.security.permission.ResourceActionsImpl" /> | |
+ <Logger level="WARN" name="com.liferay.portal.security.pwd.RegExpToolkit" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.service.impl.LayoutLocalServiceImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.service.impl.PortalLocalServiceImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.service.impl.PortalServiceImpl" /> | |
+ <Logger level="WARN" name="com.liferay.portal.service.impl.PortletLocalServiceImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.service.impl.ReleaseLocalServiceImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.service.impl.RepositoryLocalServiceImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.service.impl.ResourceLocalServiceImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.service.impl.ServiceComponentLocalServiceImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.service.impl.ThemeLocalServiceImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.service.impl.ThemeServiceImpl" /> | |
+ <Logger level="WARN" name="com.liferay.portal.service.persistence.impl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet" /> | |
+ <Logger level="WARN" name="com.liferay.portal.servlet.LanguageServlet" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.PortalSessionCreator" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.PortalSessionDestroyer" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.autologin.AutoLoginFilter" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.cache" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.dynamiccss" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.dynamiccss.DynamicCSSFilter" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.dynamiccss.DynamicCSSUtil" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.fragment" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.gzip" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.language" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.sessionid.SessionIdFilter" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.sessionid.SessionIdServletRequest" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.strip" /> | |
+ <Logger level="INFO" name="com.liferay.portal.servlet.filters.threaddump" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.servlet.filters.virtualhost.VirtualHostFilter" /> | |
+ <Logger level="INFO" name="com.liferay.portal.setup.SetupWizardSampleDataUtil" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.sharepoint" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.spring" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.spring.context.ArrayApplicationContext" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.spring.context.PortalApplicationContext" /> | |
+ <Logger level="INFO" name="com.liferay.portal.spring.context.PortalContextLoaderListener" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.spring.context.TunnelApplicationContext" /> | |
+ <Logger level="INFO" name="com.liferay.portal.spring.hibernate.DialectDetector" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.struts" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.struts.JSONAction" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.struts.PortalRequestProcessor" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.struts.StrutsUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.template.URLResourceParser" /> | |
+ <Logger level="INFO" name="com.liferay.portal.theme.ThemeLoader" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.tools.DBUpgrader" /> | |
+ <Logger level="INFO" name="com.liferay.portal.tools.sql" /> | |
+ <Logger level="INFO" name="com.liferay.portal.upgrade" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.upgrade.v6_1_1.UpgradeJournal" /> | |
+ <Logger level="INFO" name="com.liferay.portal.upgrade.v6_2_0.BaseUpgradePortletPreferences" /> | |
+ <Logger level="INFO" name="com.liferay.portal.upgrade.v6_2_0.UpgradePortletPreferences" /> | |
+ <Logger level="INFO" name="com.liferay.portal.upgrade.v7_0_0.UpgradePortletSettings" /> | |
+ <Logger level="WARN" name="com.liferay.portal.upload.UploadServletRequestImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.util" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.util.EntityResolver" /> | |
+ <Logger level="WARN" name="com.liferay.portal.util.FileImpl" /> | |
+ <Logger level="INFO" name="com.liferay.portal.util.JarUtil" /> | |
+ <Logger level="DEBUG" name="com.liferay.portal.util.MaintenanceUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.util.PortalImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.util.PortalInstances" /> | |
+ <Logger level="INFO" name="com.liferay.portal.util.PropsUtil" /> | |
+ <Logger level="INFO" name="com.liferay.portal.verify" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.webdav" /> | |
+ <Logger level="ERROR" name="com.liferay.portal.webserver.WebServerServlet" /> | |
+ <Logger level="WARN" name="com.liferay.portal.xml.SAXReaderFactory" /> | |
+ <Logger level="ERROR" name="com.liferay.portlet.PortletPreferencesImpl" /> | |
+ <Logger level="ERROR" name="com.liferay.portlet.RenderRequestFactory" /> | |
+ <Logger level="ERROR" name="com.liferay.portlet.RenderResponseFactory" /> | |
+ <Logger level="WARN" name="com.liferay.portlet.SecurityPortletContainerWrapper" /> | |
+ <Logger level="ERROR" name="com.liferay.portlet.admin" /> | |
+ <Logger level="WARN" name="com.liferay.portlet.documentlibrary.lar" /> | |
+ <Logger level="WARN" name="com.liferay.portlet.documentlibrary.messaging" /> | |
+ <Logger level="WARN" name="com.liferay.portlet.documentlibrary.sharepoint" /> | |
+ <Logger level="INFO" name="com.liferay.portlet.documentlibrary.store" /> | |
+ <Logger level="WARN" name="com.liferay.portlet.documentlibrary.util" /> | |
+ <Logger level="WARN" name="com.liferay.portlet.documentlibrary.webdav" /> | |
+ <Logger level="ERROR" name="com.liferay.util.dao" /> | |
+ <Logger level="INFO" name="com.liferay.util.dao.orm.CustomSQLUtil" /> | |
+ <Logger level="ERROR" name="com.opensymphony.oscache" /> | |
+ <Logger level="ERROR" name="com.opensymphony.oscache.plugins.clustersupport.JavaGroupsBroadcastingListener" /> | |
+ <Logger level="INFO" name="com.sample" /> | |
+ <Logger level="ERROR" name="com.sun" /> | |
+ <Logger level="ERROR" name="com.sun.faces" /> | |
+ <Logger level="WARN" name="com.zaxxer.hikari" /> | |
+ <Logger level="ERROR" name="de.hunsicker" /> | |
+ <Logger level="ERROR" name="de.nava.informa" /> | |
+ <Logger level="ERROR" name="freemarker.beans" /> | |
+ <Logger level="ERROR" name="hsqldb.db" /> | |
+ <Logger level="ERROR" name="httpclient.wire" /> | |
+ <Logger level="ERROR" name="net.htmlparser.jericho" /> | |
+ <Logger level="ERROR" name="net.sf.ehcache" /> | |
+ <Logger level="INFO" name="net.sf.ehcache.config.ConfigurationFactory" /> | |
+ <Logger level="ERROR" name="net.sf.ehcache.config.DiskStoreConfiguration" /> | |
+ <Logger level="ERROR" name="net.sf.hibernate" /> | |
+ <Logger level="WARN" name="org.apache.aries.jax.rs.whiteboard.activator.CxfJaxrsBundleActivator" /> | |
+ <Logger level="ERROR" name="org.apache.chemistry.opencmis.client.bindings.spi.atompub.HttpUtils" /> | |
+ <Logger level="ERROR" name="org.apache.pdfbox" /> | |
+ <Logger level="ERROR" name="org.apache.velocity" /> | |
+ <Logger level="ERROR" name="org.apache.xbean" /> | |
+ <Logger level="ERROR" name="org.elasticsearch.client.RestClient" /> | |
+ <Logger level="ERROR" name="org.hibernate" /> | |
+ <Logger level="OFF" name="org.hibernate.event.def.AbstractFlushingEventListener" /> | |
+ <Logger level="ERROR" name="org.hibernate.util.JDBCExceptionReporter" /> | |
+ <Logger level="ERROR" name="org.jabsorb" /> | |
+ <Logger level="ERROR" name="org.jgroups" /> | |
+ <Logger level="ERROR" name="org.openid4java" /> | |
+ <Logger level="INFO" name="org.pdfbox" /> | |
+ <Logger level="INFO" name="org.portletbridge" /> | |
+ <Logger level="ERROR" name="org.quartz" /> | |
+ <Logger level="ERROR" name="org.springframework" /> | |
+ <Logger level="INFO" name="org.springframework.aop.support.AopUtils" /> | |
+ <Logger level="WARN" name="osgi.logging" /> | |
+ <Logger level="WARN" name="osgi.logging.org_eclipse_osgi" /> | |
+ <Logger level="WARN" name="portal-web.docroot.errors.404.jsp" /> | |
+ <Logger level="INFO" name="com.liferay.portal.security.audit.router.internal" /> | |
+ | |
+ <Root level="INFO"> | |
+ <AppenderRef ref="CONSOLE" /> | |
+ </Root> | |
+ </Loggers> | |
+</Configuration> | |
diff --git a/liferay/configs/dev/portal-ext.properties b/liferay/configs/dev/portal-ext.properties | |
index 4804036..d587f43 100644 | |
--- a/liferay/configs/dev/portal-ext.properties | |
+++ b/liferay/configs/dev/portal-ext.properties | |
@@ -6,4 +6,8 @@ include-and-override=portal-developer.properties | |
#jdbc.default.driverClassName=com.mysql.cj.jdbc.Driver | |
#jdbc.default.url=jdbc:mysql://dev.server/lportaldev?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false | |
#jdbc.default.username=root | |
-#jdbc.default.password= | |
\ No newline at end of file | |
+#jdbc.default.password= | |
+ | |
+web.server.protocol=https | |
+ | |
+module.framework.properties.org.apache.felix.configadmin.plugin.interpolation.secretsdir=/opt/liferay/osgi/configs,/var/run/secrets/kubernetes.io/serviceaccount | |
\ No newline at end of file | |
diff --git a/webserver/LCP.json b/webserver/LCP.json | |
index 4cdd444..ce362d5 100644 | |
--- a/webserver/LCP.json | |
+++ b/webserver/LCP.json | |
@@ -38,7 +38,11 @@ | |
"dev": { | |
"loadBalancer": { | |
"targetPort": 80, | |
- "cdn": false | |
+ "cdn": false, | |
+ "customDomains": [ | |
+ "dracula-uat.gamerson.lfr.sh", | |
+ "dracula-prd.gamerson.lfr.sh" | |
+ ] | |
} | |
} | |
} | |
diff --git a/webserver/configs/dev/conf.d/liferay.conf b/webserver/configs/dev/conf.d/liferay.conf | |
index 95acc9f..82d3e63 100644 | |
--- a/webserver/configs/dev/conf.d/liferay.conf | |
+++ b/webserver/configs/dev/conf.d/liferay.conf | |
@@ -1,7 +1,4 @@ | |
location / { | |
- auth_basic "Authentication Required"; | |
- auth_basic_user_file /var/www/html/.htpasswd; | |
- | |
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | |
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; | |
proxy_set_header X-Forwarded-Port $http_x_forwarded_port; | |
-- | |
2.39.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment