upgrade to 7.26.0
Remove usage of keycloack SSO
This commit is contained in:
parent
cb36a81265
commit
598d7f5b09
7 changed files with 238 additions and 330 deletions
|
|
@ -20,10 +20,6 @@ services:
|
||||||
networks:
|
networks:
|
||||||
drools-network-dev:
|
drools-network-dev:
|
||||||
ipv4_address: 172.27.1.5
|
ipv4_address: 172.27.1.5
|
||||||
links:
|
|
||||||
- keycloak:keycloak
|
|
||||||
depends_on:
|
|
||||||
- keycloak
|
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
- 8001:8001
|
- 8001:8001
|
||||||
|
|
@ -250,42 +246,7 @@ services:
|
||||||
command: mongod
|
command: mongod
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
postgres:
|
|
||||||
image: keycloak-db
|
|
||||||
volumes:
|
|
||||||
- pgdata1:/var/lib/postgresql/data
|
|
||||||
- pgdata2:/home/pgdata
|
|
||||||
hostname: pg.pymma
|
|
||||||
networks:
|
|
||||||
drools-network-dev:
|
|
||||||
ipv4_address: 172.27.1.200
|
|
||||||
ports:
|
|
||||||
- 6666:5432
|
|
||||||
restart: always
|
|
||||||
|
|
||||||
keycloak:
|
|
||||||
image: jboss/keycloak:5.0.0
|
|
||||||
environment:
|
|
||||||
DB_VENDOR: POSTGRES
|
|
||||||
DB_ADDR: 172.27.1.200
|
|
||||||
DB_DATABASE: keycloakdb
|
|
||||||
DB_USER: keycloak_user
|
|
||||||
DB_SCHEMA: public
|
|
||||||
DB_PASSWORD: keycloak_user
|
|
||||||
KEYCLOAK_USER: admin
|
|
||||||
KEYCLOAK_PASSWORD: admin
|
|
||||||
# Uncomment the line below if you want to specify JDBC parameters. The parameter below is just an example, and it shouldn't be used in production without knowledge. It is highly recommended that you read the PostgreSQL JDBC driver documentation in order to use it.
|
|
||||||
#JDBC_PARAMS: "ssl=true"
|
|
||||||
hostname: keycloak.pymma
|
|
||||||
networks:
|
|
||||||
drools-network-dev:
|
|
||||||
ipv4_address: 172.27.1.201
|
|
||||||
links:
|
|
||||||
- postgres:postgres
|
|
||||||
ports:
|
|
||||||
- 10080:8080
|
|
||||||
depends_on:
|
|
||||||
- postgres
|
|
||||||
|
|
||||||
dps:
|
dps:
|
||||||
image: defreitas/dns-proxy-server:2.13.2
|
image: defreitas/dns-proxy-server:2.13.2
|
||||||
|
|
@ -310,5 +271,3 @@ volumes:
|
||||||
lucenedata:
|
lucenedata:
|
||||||
esdata2:
|
esdata2:
|
||||||
kieserverdir:
|
kieserverdir:
|
||||||
pgdata1:
|
|
||||||
pgdata2:
|
|
||||||
|
|
@ -24,11 +24,7 @@
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.training.Leisure</groupId>
|
|
||||||
<artifactId>swimmingpool</artifactId>
|
|
||||||
<version>1.0.1-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.kie</groupId>
|
<groupId>org.kie</groupId>
|
||||||
<artifactId>business-central</artifactId>
|
<artifactId>business-central</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,8 @@ EXPOSE 8001
|
||||||
|
|
||||||
####### Drools Workbench CUSTOM CONFIGURATION ############
|
####### Drools Workbench CUSTOM CONFIGURATION ############
|
||||||
ADD etc/standalone-full-drools.xml $JBOSS_HOME/standalone/configuration/standalone-full-drools.xml
|
ADD etc/standalone-full-drools.xml $JBOSS_HOME/standalone/configuration/standalone-full-drools.xml
|
||||||
#ADD etc/application-users.properties $JBOSS_HOME/standalone/configuration/application-users.properties
|
ADD etc/application-users.properties $JBOSS_HOME/standalone/configuration/application-users.properties
|
||||||
#ADD etc/application-roles.properties $JBOSS_HOME/standalone/configuration/application-roles.properties
|
ADD etc/application-roles.properties $JBOSS_HOME/standalone/configuration/application-roles.properties
|
||||||
|
|
||||||
# Added files are chowned to root user, change it to the jboss one.
|
# Added files are chowned to root user, change it to the jboss one.
|
||||||
USER root
|
USER root
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
admin=admin,analyst,kiemgmt,admingroup,rest-all
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
admin=207b6e0cc556d7084b5e2db7d822555c
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
|
|
||||||
<server xmlns="urn:jboss:domain:8.0">
|
<server xmlns="urn:jboss:domain:8.0">
|
||||||
<extensions>
|
<extensions>
|
||||||
<extension module="org.jboss.as.clustering.infinispan"/>
|
<extension module="org.jboss.as.clustering.infinispan"/>
|
||||||
|
|
@ -20,7 +22,6 @@
|
||||||
<extension module="org.jboss.as.security"/>
|
<extension module="org.jboss.as.security"/>
|
||||||
<extension module="org.jboss.as.transactions"/>
|
<extension module="org.jboss.as.transactions"/>
|
||||||
<extension module="org.jboss.as.webservices"/>
|
<extension module="org.jboss.as.webservices"/>
|
||||||
<extension module="org.keycloak.keycloak-adapter-subsystem" />
|
|
||||||
<extension module="org.jboss.as.weld"/>
|
<extension module="org.jboss.as.weld"/>
|
||||||
<extension module="org.wildfly.extension.batch.jberet"/>
|
<extension module="org.wildfly.extension.batch.jberet"/>
|
||||||
<extension module="org.wildfly.extension.bean-validation"/>
|
<extension module="org.wildfly.extension.bean-validation"/>
|
||||||
|
|
@ -147,41 +148,9 @@
|
||||||
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
|
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
|
||||||
<subsystem xmlns="urn:jboss:domain:datasources:5.0">
|
<subsystem xmlns="urn:jboss:domain:datasources:5.0">
|
||||||
<datasources>
|
<datasources>
|
||||||
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
|
|
||||||
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
|
|
||||||
<driver>h2</driver>
|
|
||||||
<security>
|
|
||||||
<user-name>sa</user-name>
|
|
||||||
<password>sa</password>
|
|
||||||
</security>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!--connection-url>jdbc:postgresql://localhost:5432/jbpm77</connection-url>
|
|
||||||
<driver-class>org.postgresql.Driver</driver-class>
|
|
||||||
<driver>postgres</driver>
|
|
||||||
<security>
|
|
||||||
<user-name>jbpm</user-name>
|
|
||||||
<password>jbpm</password>
|
|
||||||
</security-->
|
|
||||||
</datasource>
|
|
||||||
<datasource jndi-name="java:jboss/datasources/jbpmds" pool-name="jbpmds" enabled="true" use-java-context="true">
|
|
||||||
<connection-url>jdbc:h2:mem:test2;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
|
|
||||||
<driver>h2</driver>
|
|
||||||
<security>
|
|
||||||
<user-name>sa</user-name>
|
|
||||||
<password>sa</password>
|
|
||||||
</security>
|
|
||||||
<!--connection-url>jdbc:postgresql://localhost:5432/jbpm77</connection-url>
|
|
||||||
<driver-class>org.postgresql.Driver</driver-class>
|
|
||||||
<driver>postgres</driver>
|
|
||||||
<security>
|
|
||||||
<user-name>jbpm</user-name>
|
|
||||||
<password>jbpm</password>
|
|
||||||
</security-->
|
|
||||||
</datasource>
|
|
||||||
<drivers>
|
<drivers>
|
||||||
<!--driver name="postgres" module="org.postgresql" /-->
|
|
||||||
<driver name="h2" module="com.h2database.h2">
|
<driver name="h2" module="com.h2database.h2">
|
||||||
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
|
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
|
||||||
</driver>
|
</driver>
|
||||||
|
|
@ -208,7 +177,7 @@
|
||||||
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
|
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
|
||||||
</managed-scheduled-executor-services>
|
</managed-scheduled-executor-services>
|
||||||
</concurrent>
|
</concurrent>
|
||||||
<default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default" />
|
<!--default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/-->
|
||||||
</subsystem>
|
</subsystem>
|
||||||
<subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
|
<subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
|
||||||
<subsystem xmlns="urn:jboss:domain:ejb3:5.0">
|
<subsystem xmlns="urn:jboss:domain:ejb3:5.0">
|
||||||
|
|
@ -280,7 +249,6 @@
|
||||||
<realm name="ManagementRealm" role-decoder="groups-to-roles"/>
|
<realm name="ManagementRealm" role-decoder="groups-to-roles"/>
|
||||||
<realm name="local" role-mapper="super-user-mapper"/>
|
<realm name="local" role-mapper="super-user-mapper"/>
|
||||||
</security-domain>
|
</security-domain>
|
||||||
|
|
||||||
</security-domains>
|
</security-domains>
|
||||||
<security-realms>
|
<security-realms>
|
||||||
<identity-realm name="local" identity="$local"/>
|
<identity-realm name="local" identity="$local"/>
|
||||||
|
|
@ -432,18 +400,6 @@
|
||||||
<jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
|
<jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
|
||||||
</subsystem>
|
</subsystem>
|
||||||
<subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
|
<subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
|
||||||
<subsystem xmlns="urn:jboss:domain:keycloak:1.1">
|
|
||||||
<secure-deployment name="kie-wb.war">
|
|
||||||
<realm>demo</realm>
|
|
||||||
<resource>kie</resource>
|
|
||||||
<enable-basic-auth>true</enable-basic-auth>
|
|
||||||
<realm-public-key>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQBLWufOyICqNgRYzZZU/RsoosuKCH7gCsP/dOnfb8t3EUcZrt6rKvn9uSyVfCjJ0EhZBsaQQXNuyildY3Nbbs4uVlRUtHGZoqbnMZfdP1kZTrSnVLS+ckP19UoIVMZUykXEih8jmtmvXKCqeuB81GUW0zrUDHR3QCGihp5XyuLKvprXl+m3zUL7HYWlT6gXgWLx4C8P2XOcuj+G7/FHZjEvNWCUMp4EslVxMcmLoYjMs1y8sisXrpFbeE6blvoSNXL1RGanMJt9oVW/sWVw94wILavmiCxtd1VsZbzXTdBM8kX0Ro2So7OJKWBmBdq0M7v5U4A8yhkJt+2QYA3VtwIDAQAB</realm-public-key>
|
|
||||||
<auth-server-url>http://host.docker:10080/auth</auth-server-url>
|
|
||||||
<ssl-required>external</ssl-required>
|
|
||||||
<principal-attribute>preferred_username</principal-attribute>
|
|
||||||
<credential name="secret">dd7fc22d-ba01-4387-b68a-316b12a741e8</credential>
|
|
||||||
</secure-deployment>
|
|
||||||
</subsystem>
|
|
||||||
<subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
|
<subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
|
||||||
<subsystem xmlns="urn:jboss:domain:mail:3.0">
|
<subsystem xmlns="urn:jboss:domain:mail:3.0">
|
||||||
<mail-session name="default" jndi-name="java:jboss/mail/Default">
|
<mail-session name="default" jndi-name="java:jboss/mail/Default">
|
||||||
|
|
@ -521,11 +477,6 @@
|
||||||
<policy-module code="Delegating" flag="required"/>
|
<policy-module code="Delegating" flag="required"/>
|
||||||
</authorization>
|
</authorization>
|
||||||
</security-domain>
|
</security-domain>
|
||||||
<security-domain name="keycloak">
|
|
||||||
<authentication>
|
|
||||||
<login-module code="org.keycloak.adapters.jboss.KeycloakLoginModule" flag="required" />
|
|
||||||
</authentication>
|
|
||||||
</security-domain>
|
|
||||||
</security-domains>
|
</security-domains>
|
||||||
</subsystem>
|
</subsystem>
|
||||||
<subsystem xmlns="urn:jboss:domain:security-manager:1.0">
|
<subsystem xmlns="urn:jboss:domain:security-manager:1.0">
|
||||||
|
|
@ -576,13 +527,13 @@
|
||||||
</profile>
|
</profile>
|
||||||
<interfaces>
|
<interfaces>
|
||||||
<interface name="management">
|
<interface name="management">
|
||||||
<inet-address value="${jboss.bind.address.management:127.0.0.1}" />
|
<inet-address value="0.0.0.0"/>
|
||||||
</interface>
|
</interface>
|
||||||
<interface name="public">
|
<interface name="public">
|
||||||
<inet-address value="${jboss.bind.address:127.0.0.1}" />
|
<inet-address value="0.0.0.0"/>
|
||||||
</interface>
|
</interface>
|
||||||
<interface name="unsecure">
|
<interface name="unsecure">
|
||||||
<inet-address value="${jboss.bind.address.unsecure:127.0.0.1}" />
|
<inet-address value="0.0.0.0"/>
|
||||||
</interface>
|
</interface>
|
||||||
</interfaces>
|
</interfaces>
|
||||||
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
|
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
|
||||||
|
|
|
||||||
2
pom.xml
2
pom.xml
|
|
@ -20,7 +20,7 @@
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<jbpm.version>7.25.0.Final</jbpm.version>
|
<jbpm.version>7.26.0.Final</jbpm.version>
|
||||||
|
|
||||||
<spring.boot.version>2.1.2.RELEASE</spring.boot.version>
|
<spring.boot.version>2.1.2.RELEASE</spring.boot.version>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
editor.link_modal.header
Reference in a new issue