#22857 rolling back some config

dotCMS/src/integration-test/resources/it-dotcms-config-cluster.properties

@@ -101,12 +101,11 @@ ES_AUTH_TLS_CLIENT_CERT=certs/elasticsearch.pem
 ES_AUTH_TLS_CLIENT_KEY=certs/elasticsearch.key
 ES_AUTH_TLS_CA_CERT=certs/root-ca.pem
 
-ES_HOSTNAME=localhost
-ES_ENDPOINTS=http://localhost:9200
+ES_HOSTNAME=elasticsearch
 
 #Set token in case ES_AUTH_TYPE=JWT
 #ES_AUTH_JWT_TOKEN=eyJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6ImFkbWluIiwiaXNzIjoiaHR0cHM6Ly9sb2NhbGhvc3QiLCJzdWIiOiJhZG1pbiIsImV4cCI6MTU2MjExODY1OTA0Mn0.f-t30zgA53Am3w7ueWNFpnhz_5SWiJjKaOT-rNeEp_M
 
 ##	These lines should be last to allow plugins to override values - touche pas!
 ## BEGIN PLUGINS
-## END PLUGINS
+## END PLUGINS

dotCMS/src/integration-test/resources/it-dotmarketing-config.properties

@@ -61,12 +61,12 @@ ASSET_PATH = /assets
 ##	shared folder in unix/linux enviroments we encourage you to use symbolic links
 ##	If this variable is commented the system will work as usual using
 ##	the ASSET_PATH variable as the assets directory inside liferay web root
-ASSET_REAL_PATH = /Users/jsanca/gitsources/new-core2/tomcat9/webapps/ROOT/assets
+ASSET_REAL_PATH = /tomcat8/webapps/ROOT/assets
 
 ##	This variable should be used if the dynamic content is to be placed outside of the web application.  By the default, the location
 ##	is in dotCMS/dotsecure.  If running as war inside an application server, it is important to move this data to a location
 ##	outside of the web application, to prevent data such as the cache and the index from being deleted if the war is redeployed.
-DYNAMIC_CONTENT_PATH=/Users/jsanca/gitsources/new-core2/tomcat9/webapps/ROOT/dotsecure
+DYNAMIC_CONTENT_PATH=/tomcat8/webapps/ROOT/dotsecure
 
 ##	REDIRECT_TO_LOGIN = /dotCMS/login   <---- add a redirect to the /portal/401.jsp instead.
 EMAIL_BACKUPS = /email_backups
@@ -809,7 +809,7 @@ CMS_INDEX_PAGE = index
 mysql_storage_engine_varname=default_storage_engine
 
 ## GeoIP2 DB Path Override (absolute path) (defaults to :
-GEOIP2_CITY_DATABASE_PATH_OVERRIDE=/Users/jsanca/gitsources/new-core2/tomcat9/webapps/ROOT/WEB-INF/geoip2/GeoLite2-City.mmdb
+GEOIP2_CITY_DATABASE_PATH_OVERRIDE=/tomcat8/webapps/ROOT/WEB-INF/geoip2/GeoLite2-City.mmdb
 
 ## Rules engine maximun execution time in ms this property allow to find any rules that
 ## are running slower than expected, so we can manage the performance of the dotCMS server.
@@ -821,10 +821,10 @@ api.system.ruleengine.actionlet.VisitorTagsActionlet.MAX_TAGS=20
 #GOOGLE_TRANSLATE_SERVICE_API_KEY=put-your-key-here
 
 ## Path to the toolbox.xml file
-TOOLBOX_MANAGER_PATH=/Users/jsanca/gitsources/new-core2/tomcat9/webapps/ROOT/WEB-INF/toolbox.xml
+#TOOLBOX_MANAGER_PATH=<tomcat8>/webapps/ROOT/WEB-INF/toolbox.xml
 
 ## Path to felix folder
-felix.base.dir=/Users/jsanca/gitsources/new-core2/tomcat9/webapps/ROOT/WEB-INF/felix
+felix.base.dir=/tomcat8/webapps/ROOT/WEB-INF/felix
 
 GDPR_CONSENT_DEFAULT_PROPERTY=true
 WHITELISTED_HEADERS=User-Agent,Host,Accept-Language,Referer,
@@ -843,4 +843,4 @@ api.cors.default.Access-Control-Expose-Headers=*
 api.cors.graphql.Access-Control-Expose-Headers=Content-Type,Cache-Control
 
 APPS_IMPORT_EXPORT_DEFAULT_PASSWORD=WJM9wwu5YjBLAgjUmXgfxhLLCMSJpLyM
-dotcms.dev.mode=true
+dotcms.dev.mode=true

dotCMS/src/integration-test/resources/postgres-db-config.properties

@@ -1,8 +1,8 @@
 #Postgres Connection
 driverClassName=org.postgresql.Driver
-jdbcUrl=jdbc:postgresql://localhost/dotcms?autosave=conservative
-username=dotcms
-password=dotcms
+jdbcUrl=jdbc:postgresql://database/dotcms?autosave=conservative
+username=postgres
+password=postgres
 ## Initial wait for a new connection in milliseconds
 connectionTimeout=3000
 ## Pool Min and Max connections
@@ -13,4 +13,4 @@ idleTimeout=300000
 ## Max lifetime of any connection
 maxLifetime=120000
 ## Log potential leaks after milliseconds
-leakDetectionThreshold=60000
+leakDetectionThreshold=60000