updated sso
diff --git a/defaults/main.yml b/defaults/main.yml index b793997..833ab58 100644 --- a/defaults/main.yml +++ b/defaults/main.yml
@@ -5,11 +5,14 @@ jwt_key_folder: "{{ apigee_home }}/customer/application/apigee-sso/jwt-keys" jwt_private_key: private_key.pem +edge_sso_jwt_private_key_filepath: "{{ jwt_key_folder }}/{{ jwt_private_key }}" jwt_public_key: public_key.pem +edge_sso_jwt_public_key_filepath: "{{ jwt_key_folder }}/{{ jwt_public_key }}" jwt_key_size: 2048 saml_folder: "{{ apigee_home }}/customer/application/apigee-sso/saml" saml_private_key: server.key +edge_sso_saml_service_provider_key: "{{ saml_folder }}/{{ saml_private_key }}" saml_private_encryption_type: aes256 saml_private_key_size: 1024
diff --git a/meta/main.yml b/meta/main.yml index 7223799..feb7ebf 100644 --- a/meta/main.yml +++ b/meta/main.yml
@@ -52,6 +52,7 @@ # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -dependencies: [] +dependencies: +- { role: apigee-opdk-modules } # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. \ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml index 267c4a2..1dc05b3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml
@@ -7,6 +7,14 @@ name: openssh state: present +- name: Update cache with key and value + cache: + key: "{{ item.key }}" + value: "{{ item.value }}" + with_items: + - { key: 'edge_sso_jwt_private_key_filepath', value: '{{ edge_sso_jwt_private_key_filepath }}' } + - { key: 'edge_sso_saml_service_provider_key', value: '{{ edge_sso_saml_service_provider_key }}' } + - name: Create Private key and Self Signed Certificate Request tags: ['private'] include_tasks: create-saml-keys-cert.yml
diff --git a/templates/edge-sso-installer-config.conf.j2 b/templates/edge-sso-installer-config.conf.j2 index 3eb4e40..d636e84 100644 --- a/templates/edge-sso-installer-config.conf.j2 +++ b/templates/edge-sso-installer-config.conf.j2
@@ -32,8 +32,8 @@ SSO_ADMIN_SECRET={{ edge_sso_admin_secret | default(opdk_user_pass) }} # Path to signing key and secret from "Create the TLS keys and certificates" above. -SSO_JWT_SIGNINIG_KEY_FILEPATH={{ edge_sso_jwt_signing_key_filepath | default('/opt/apigee/customer/application/apigee-sso/jwt-keys/privkey.pem') }} -SSO_JWT_VERIFICATION_KEY_FILEPATH={{ edge_sso_jwt_verification_key_filepath | default('/opt/apigee/customer/application/apigee-sso/jwt-keys/pubkey.pem') }} +SSO_JWT_SIGNINIG_KEY_FILEPATH={{ edge_sso_jwt_private_key_filepath | default('/opt/apigee/customer/application/apigee-sso/jwt-keys/privkey.pem') }} +SSO_JWT_VERIFICATION_KEY_FILEPATH={{ edge_sso_jwt_public_key_filepath | default('/opt/apigee/customer/application/apigee-sso/jwt-keys/pubkey.pem') }} # Name of SAML IDP. For example, okta or adfs. SSO_SAML_IDP_NAME={{ edge_sso_saml_ipd_name | default('okta') }}