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

certgetter / staging: drop certgetter01.stg

Browse source 
We can just use the main one and not bother with a specific stg one

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-10-14 16:07:41 -07:00
parent ff0bf41f00
commit 50cc7317bf
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
inventory/inventory
View file

@ -34,9 +34,6 @@ retrace_stg_aws
[certgetter] [certgetter]
certgetter01.iad2.fedoraproject.org certgetter01.iad2.fedoraproject.org
[certgetter_stg]
certgetter01.stg.iad2.fedoraproject.org
[backup] [backup]
backup01.iad2.fedoraproject.org backup01.iad2.fedoraproject.org
@ -604,7 +601,6 @@ buildvm-x86-03.stg.iad2.fedoraproject.org
buildvm-x86-04.stg.iad2.fedoraproject.org buildvm-x86-04.stg.iad2.fedoraproject.org
buildvm-x86-05.stg.iad2.fedoraproject.org buildvm-x86-05.stg.iad2.fedoraproject.org
busgateway01.stg.iad2.fedoraproject.org busgateway01.stg.iad2.fedoraproject.org
certgetter01.stg.iad2.fedoraproject.org
compose-x86-01.stg.iad2.fedoraproject.org compose-x86-01.stg.iad2.fedoraproject.org
copr-be-dev.aws.fedoraproject.org copr-be-dev.aws.fedoraproject.org
copr-dist-git-dev.aws.fedoraproject.org copr-dist-git-dev.aws.fedoraproject.org
@ -683,7 +679,6 @@ batcave01.iad2.fedoraproject.org
bastion01.iad2.fedoraproject.org bastion01.iad2.fedoraproject.org
bastion02.iad2.fedoraproject.org bastion02.iad2.fedoraproject.org
certgetter01.iad2.fedoraproject.org certgetter01.iad2.fedoraproject.org
certgetter01.stg.iad2.fedoraproject.org
log01.iad2.fedoraproject.org log01.iad2.fedoraproject.org
ns01.iad2.fedoraproject.org ns01.iad2.fedoraproject.org
ns02.iad2.fedoraproject.org ns02.iad2.fedoraproject.org

4
playbooks/groups/certgetter.yml
View file

@ -1,7 +1,7 @@
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter:certgetter_stg" - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter"
- name: make the box be real - name: make the box be real
hosts: certgetter:certgetter_stg hosts: certgetter
user: root user: root
gather_facts: True gather_facts: True

10
roles/letsencrypt/tasks/main.yml
View file

@ -1,5 +1,5 @@
- name: Generate (or renew) the certificate - name: Generate (or renew) the certificate
delegate_to: "certgetter01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "certgetter01.iad2.fedoraproject.org"
command: certbot certonly --expand --keep -n --webroot --webroot-path /var/www/html/ -d {{','.join([site_name] + server_aliases)}} command: certbot certonly --expand --keep -n --webroot --webroot-path /var/www/html/ -d {{','.join([site_name] + server_aliases)}}
run_once: true run_once: true
register: certbot_output register: certbot_output
@ -10,7 +10,7 @@
# Find the directory to use # Find the directory to use
- name: Get the directory to use - name: Get the directory to use
delegate_to: "certgetter01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "certgetter01.iad2.fedoraproject.org"
# Sometimes we get directories like site-0001, site-0002, etc. We want the latest # Sometimes we get directories like site-0001, site-0002, etc. We want the latest
shell: "file /etc/letsencrypt/live/{{site_name}}* | tail -1 | sed -e 's/: directory//' | tr -d '\n'" shell: "file /etc/letsencrypt/live/{{site_name}}* | tail -1 | sed -e 's/: directory//' | tr -d '\n'"
register: certbot_dir register: certbot_dir
@ -21,7 +21,7 @@
# And once we do that, we need to copy some things. # And once we do that, we need to copy some things.
- name: Obtain the certificate - name: Obtain the certificate
delegate_to: "certgetter01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "certgetter01.iad2.fedoraproject.org"
command: "cat {{certbot_dir.stdout}}/cert.pem" command: "cat {{certbot_dir.stdout}}/cert.pem"
register: certbot_certificate register: certbot_certificate
changed_when: 'false' changed_when: 'false'
@ -30,7 +30,7 @@
- letsencrypt - letsencrypt
- name: Obtain the intermediate certificate - name: Obtain the intermediate certificate
delegate_to: "certgetter01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "certgetter01.iad2.fedoraproject.org"
command: cat {{certbot_dir.stdout}}/chain.pem command: cat {{certbot_dir.stdout}}/chain.pem
register: certbot_chain register: certbot_chain
changed_when: 'false' changed_when: 'false'
@ -39,7 +39,7 @@
- letsencrypt - letsencrypt
- name: Obtain the key - name: Obtain the key
delegate_to: "certgetter01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "certgetter01.iad2.fedoraproject.org"
command: cat {{certbot_dir.stdout}}/privkey.pem command: cat {{certbot_dir.stdout}}/privkey.pem
register: certbot_key register: certbot_key
changed_when: 'false' changed_when: 'false'