Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fas: some static fixes

Browse source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2019-05-11 00:40:42 +02:00
parent f35c7220f5
commit 67a0f616b2
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/fas_server/templates/configmap.yml
View file

@ -40,7 +40,7 @@ data:
ln -s /etc/httpd/modules /httpdir/modules ln -s /etc/httpd/modules /httpdir/modules
truncate --size=0 /httpdir/accesslog /httpdir/errorlog truncate --size=0 /httpdir/accesslog /httpdir/errorlog
tail -qf /httpdir/accesslog /httpdir/errorlog & tail -qf /httpdir/accesslog /httpdir/errorlog &
exec /usr/sbin/httpd.worker -f /etc/fas/httpd.conf -DFOREGROUND -DNO_DETACH exec /usr/sbin/httpd.worker -f /etc/fas/static_httpd.conf -DFOREGROUND -DNO_DETACH
static_httpd.conf: |- static_httpd.conf: |-
Listen 0.0.0.0:8080 Listen 0.0.0.0:8080
ServerRoot "/httpdir" ServerRoot "/httpdir"

4
roles/openshift-apps/fas/templates/deploymentconfig-fas.yml
View file

@ -64,6 +64,9 @@ spec:
ports: ports:
- containerPort: 8080 - containerPort: 8080
volumeMounts: volumeMounts:
- name: config-volume
mountPath: /etc/fas
readOnly: true
- name: httpdir-volume - name: httpdir-volume
mountPath: /httpdir mountPath: /httpdir
readinessProbe: readinessProbe:
@ -95,6 +98,7 @@ spec:
automatic: true automatic: true
containerNames: containerNames:
- fas - fas
- static
from: from:
kind: ImageStreamTag kind: ImageStreamTag
name: fas:latest name: fas:latest