Move install the totpcgi key and cert to the totpcgi role

This commit is contained in:
Pierre-Yves Chibon
2014-12-07 21:04:08 +01:00
parent 9e33435096
commit cdabbd4d24
2 changed files with 22 additions and 22 deletions

View File

@@ -190,28 +190,6 @@
tags:
- config
- name: install totpcgi key and cert
copy: src="{{ puppet_private }}/{{ item.file }}" dest="{{ item.dest }}"
owner=fas group=fas mode=0400
with_items:
- {file: 2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.crt, dest: /etc/pki/totpcgi/totpcgi-server.crt }
- {file: 2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.key, dest: /etc/pki/totpcgi/totpcgi-server.key }
- {file: 2fa-certs/keys/ca.crt, dest: /etc/pki/totpcgi/totpcgi-ca.crt }
when: master_fas_node == True and '.stg.' in inventory_hostname
tags:
- config
- name: install totpcgi key and cert
copy: src="{{ puppet_private }}/{{ item.file }}" dest="{{ item.dest }}"
owner=fas group=fas mode=0400
with_items:
- {file: 2fa-certs/keys/fas-all.phx2.fedoraproject.org.crt, dest: /etc/pki/totpcgi/totpcgi-server.crt }
- {file: 2fa-certs/keys/fas-all.phx2.fedoraproject.org.key, dest: /etc/pki/totpcgi/private/totpcgi-server.key }
- {file: 2fa-certs/keys/ca.crt, dest: /etc/pki/totpcgi/totpcgi-ca.crt }
when: master_fas_node == True and not '.stg.' in inventory_hostname
tags:
- config
- name: install /var/lib/fedora-ca/Makefile file
copy: >
src="Makefile.fedora-ca"

View File

@@ -34,6 +34,28 @@
- pki/totpcgi
- totpcgi/totp
- name: install totpcgi key and cert
copy: src="{{ puppet_private }}/{{ item.file }}" dest="{{ item.dest }}"
owner=fas group=fas mode=0400
with_items:
- {file: 2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.crt, dest: /etc/pki/totpcgi/totpcgi-server.crt }
- {file: 2fa-certs/keys/fas-all.stg.phx2.fedoraproject.org.key, dest: /etc/pki/totpcgi/totpcgi-server.key }
- {file: 2fa-certs/keys/ca.crt, dest: /etc/pki/totpcgi/totpcgi-ca.crt }
when: master_fas_node == True and '.stg.' in inventory_hostname
tags:
- config
- name: install totpcgi key and cert
copy: src="{{ puppet_private }}/{{ item.file }}" dest="{{ item.dest }}"
owner=fas group=fas mode=0400
with_items:
- {file: 2fa-certs/keys/fas-all.phx2.fedoraproject.org.crt, dest: /etc/pki/totpcgi/totpcgi-server.crt }
- {file: 2fa-certs/keys/fas-all.phx2.fedoraproject.org.key, dest: /etc/pki/totpcgi/private/totpcgi-server.key }
- {file: 2fa-certs/keys/ca.crt, dest: /etc/pki/totpcgi/totpcgi-ca.crt }
when: master_fas_node == True and not '.stg.' in inventory_hostname
tags:
- config
- name: create template directory for totpcgiprov
file: path=/etc/{{ item }} state=directory owner=root group=totpcgiprov mode=750
with_items: