diff --git a/roles/openshift-apps/koschei/templates/frontend-config.yml b/roles/openshift-apps/koschei/templates/frontend-config.yml index 0c5ddb11b5..c131997596 100644 --- a/roles/openshift-apps/koschei/templates/frontend-config.yml +++ b/roles/openshift-apps/koschei/templates/frontend-config.yml @@ -5,5 +5,5 @@ metadata: stringData: config-frontend.cfg: | {{ lookup('template', roles_path + '/openshift-apps/koschei/templates/config-frontend.cfg.j2') | indent }} - httpd.conf: | - {{ lookup('template', roles_path + '/openshift-apps/koschei/templates/httpd.conf.j2') | indent }} + httpd-virthost.conf: | + {{ lookup('template', roles_path + '/openshift-apps/koschei/templates/httpd-virthost.conf.j2') | indent }} diff --git a/roles/openshift-apps/koschei/templates/httpd-virthost.conf.j2 b/roles/openshift-apps/koschei/templates/httpd-virthost.conf.j2 new file mode 100644 index 0000000000..143aec6125 --- /dev/null +++ b/roles/openshift-apps/koschei/templates/httpd-virthost.conf.j2 @@ -0,0 +1,18 @@ +RewriteEngine on +RewriteRule ^/documentation/?$ https://fedoraproject.org/wiki/Koschei [R=301,L] + +OIDCRedirectURI "{{ koschei_topurl }}/login/redirect_uri" +OIDCProviderMetadataURL "https://{{ koschei_oidc_provider }}/openidc/wellknown_openid_configuration" +OIDCClientID "koschei" +OIDCClientSecret "{{ koschei_oidc_client_secret }}" +OIDCCryptoPassphrase "{{ koschei_oidc_crypto_secret }}" +OIDCSSLValidateServer On +OIDCResponseType "code" +OIDCSessionType client-cookie + +OIDCScope "openid profile" + + + AuthType openid-connect + Require valid-user + diff --git a/roles/openshift-apps/koschei/templates/httpd.conf.j2 b/roles/openshift-apps/koschei/templates/httpd.conf.j2 deleted file mode 100644 index 668529cebe..0000000000 --- a/roles/openshift-apps/koschei/templates/httpd.conf.j2 +++ /dev/null @@ -1,20 +0,0 @@ - - RewriteEngine on - RewriteRule ^/documentation/?$ https://fedoraproject.org/wiki/Koschei [R=301,L] - - OIDCRedirectURI "{{ koschei_topurl }}/login/redirect_uri" - OIDCProviderMetadataURL "https://{{ koschei_oidc_provider }}/openidc/wellknown_openid_configuration" - OIDCClientID "koschei" - OIDCClientSecret "{{ koschei_oidc_client_secret }}" - OIDCCryptoPassphrase "{{ koschei_oidc_crypto_secret }}" - OIDCSSLValidateServer On - OIDCResponseType "code" - OIDCSessionType client-cookie - - OIDCScope "openid profile" - - - AuthType openid-connect - Require valid-user - -