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

fas / totpcgi: move templates into configmap and same dir.

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-08-01 21:45:38 +00:00 • committed by Pierre-Yves Chibon
parent 8427e824c5
commit 41ae017220
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/openshift-apps/fas/templates/buildconfig-totpcgi.yml
View file

@ -31,11 +31,6 @@ spec:
RUN chmod -R o+rx /var/www/totpcgi*
RUN mkdir -p /etc/totpcgi/templates
RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/html/error.html -o /etc/totpcgi/templates/error.html
RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/html/login.html -o /etc/totpcgi/templates/login.html
RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/html/totp.html -o /etc/totpcgi/templates/totp.html
EXPOSE 8080
ENTRYPOINT bash /etc/totpcgi/start.sh
type: Dockerfile

6
roles/totpcgi/templates/configmap.yml
View file

@ -127,3 +127,9 @@ data:
Options ExecCGI
</Directory>
</VirtualHost>
error.html: |-
{{ lookup('file', '{{ roles_path }}/totpcgi/files/html/error.html') | indent() }}
login.html: |-
{{ lookup('file', '{{ roles_path }}/totpcgi/files/html/login.html') | indent() }}
totp.html: |-
{{ lookup('file', '{{ roles_path }}/totpcgi/files/html/totp.html') | indent() }}

2
roles/totpcgi/templates/provisioning.conf.j2
View file

@ -40,7 +40,7 @@ css_root = /totpcgiprovision/
# Used by provisioning.cgi
# Where to find the templates files.
templates_dir = /etc/totpcgi/templates
templates_dir = /etc/totpcgi
# Used by provisioning.cgi
# Whether to rely on HTTP auth to handle authentication.