diff --git a/README.md b/README.md index 7a68d94..6cb66dc 100644 --- a/README.md +++ b/README.md @@ -283,12 +283,22 @@ For more information take a look at * Default: 30000 * Description: the default service port that ingress will point to -#### `ingress.blockAcsSolrApi` +#### `ingress.blockAcsSolrApi.enabled` * Required: false * Default: `true` * Description: Enable 403 handler for alfresco api solr endpoints +#### `ingress.blockAcsSolrApi.paths` +* Required: false +* Default: +```yaml +- /alfresco/s/api/solr +- /alfresco/service/api/solr +- /alfresco/service/api/solr +- /alfresco/wcservice/api/solr +``` +* Description: List of paths that are blocked ### ACS #### `acs.replicas` diff --git a/xenit-alfresco/templates/ingress/alfresco-ingress.yaml b/xenit-alfresco/templates/ingress/alfresco-ingress.yaml index efa6782..62e3dbb 100644 --- a/xenit-alfresco/templates/ingress/alfresco-ingress.yaml +++ b/xenit-alfresco/templates/ingress/alfresco-ingress.yaml @@ -63,29 +63,9 @@ spec: port: number: 30500 {{- end }} - {{- if .Values.ingress.blockAcsSolrApi }} - - path: /alfresco/s/api/solr - pathType: Prefix - backend: - service: - name: nginx-403-service - port: - number: 30403 - - path: /alfresco/service/api/solr - pathType: Prefix - backend: - service: - name: nginx-403-service - port: - number: 30403 - - path: /alfresco/wcs/api/solr - pathType: Prefix - backend: - service: - name: nginx-403-service - port: - number: 30403 - - path: /alfresco/wcservice/api/solr + {{- if .Values.ingress.blockAcsSolrApi.enabled }} + {{- range .Values.ingress.blockAcsSolrApi.paths }} + - path: {{ . }} pathType: Prefix backend: service: @@ -93,6 +73,7 @@ spec: port: number: 30403 {{- end }} + {{- end }} {{- if .Values.ingress.additionalPaths }} {{ toYaml .Values.ingress.additionalPaths | nindent 6 }} {{- end }} diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml index 9c96e55..2ca6b51 100644 --- a/xenit-alfresco/values.yaml +++ b/xenit-alfresco/values.yaml @@ -26,7 +26,13 @@ ingress: defaultBackend: service: acs-service port: 30000 - blockAcsSolrApi: true + blockAcsSolrApi: + enabled: true + paths: + - /alfresco/s/api/solr + - /alfresco/service/api/solr + - /alfresco/service/api/solr + - /alfresco/wcservice/api/solr acs: replicas: 1 image: