Commit 1bd9da23 authored by Brian Long's avatar Brian Long
Browse files

Merge remote-tracking branch 'origin/aims' into aps-aims

parents 8b7ec465 f23cda3f

.env

+1 −0
Changes for .env: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license 
PROXY_PROTOCOL=http

PROXY_HOST=localhost

PROXY_PORT=8080

IDENTITY_SERVICE_BASEURL=http://auth.example.org:8080

docker-compose.yml

+1 −1
Changes for docker-compose.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ services: 


    proxy:

        build: ./nginx-ingress

        image: local/nginx-ingress:acs

        image: local/nginx-ingress:aps-aims

        ports:

            - 8080:8080

        depends_on:

keycloak-alfresco-realm.json

0 → 100644
+47 −0
Changes for keycloak-alfresco-realm.json: 47 added lines, 0 removed lines.
Original line number Diff line number Diff line 
{

  "realm": "alfresco",

  "enabled": true,

  "sslRequired": "external",

  "registrationAllowed": false,

  "roles": {

    "realm": [ {

      "name": "user",

      "description": "User privileges"

    }, {

      "name": "admin",

      "description": "Administrator privileges"

    } ]

  },

  "clients": [

    {

      "clientId": "alfresco",

      "name": "Alfresco Products",

      "enabled": true,

      "alwaysDisplayInConsole": false,

      "redirectUris": [ "*" ],

      "standardFlowEnabled": true,

      "implicitFlowEnabled": true,

      "directAccessGrantsEnabled": false,

      "publicClient": true,

      "protocol": "openid-connect",

      "attributes": {

        "login_theme": "alfresco"

      }

    }

  ],

  "requiredCredentials": [ "password" ],

  "users": [

    {

      "username": "admin",

      "email": "admin@app.activiti.com",

      "enabled": true,

      "credentials" : [

        {

          "type" : "password",

          "value" : "admin"

        }

      ],

      "realmRoles": [ "user", "admin" ]

    }

  ]

}

nginx-ingress/entrypoint.sh

+4 −0
Changes for nginx-ingress/entrypoint.sh: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ if [[ $APS_ADMIN_URL ]]; then 
  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf

fi



if [[ $AIMS_URL ]]; then

  sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf

fi



if [[ $ACCESS_LOG ]]; then

  sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf

fi

nginx-ingress/nginx.conf

+11 −1
Changes for nginx-ingress/nginx.conf: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ http { 


        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;

        proxy_redirect off;

        proxy_buffering off;

#        proxy_buffering off;

        proxy_buffer_size	64k;

        proxy_buffers		4 256k;

        proxy_busy_buffers_size	256k;

        proxy_set_header Host              $http_host;

        proxy_set_header X-Real-IP         $remote_addr;

        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
@@ -55,5 +58,12 @@ http { 
            # If using external proxy / load balancer (for initial redirect if no trailing slash)

            absolute_redirect off;

        }



        location /auth/ {

            proxy_pass http://identity:8080;



            # If using external proxy / load balancer (for initial redirect if no trailing slash)

            absolute_redirect off;

        }

    }

}