From 81b2c473623c616f69ceea9df99893bf2eba2ea7 Mon Sep 17 00:00:00 2001 From: eric Date: Thu, 31 Jan 2019 15:28:27 -0500 Subject: [PATCH] handle 2nd hostname --- group_vars/batterup/vars.yml | 1 + group_vars/dev/vars.yml | 5 +++-- group_vars/ondeck/vars.yml | 2 +- group_vars/production/vars.yml | 1 + roles/regluit_prod/tasks/certs.yml | 11 ++++++++++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/group_vars/batterup/vars.yml b/group_vars/batterup/vars.yml index d512e67..70bf08a 100644 --- a/group_vars/batterup/vars.yml +++ b/group_vars/batterup/vars.yml @@ -13,6 +13,7 @@ wsgi_python_path: "/opt/regluit/venv/bin/python" git_repo: "https://github.com/Gluejar/regluit.git" git_branch: "production" le_endpoint: https://acme-staging-v02.api.letsencrypt.org/directory +alt_server_name: ### Variables in settings.prod.py ### mysql_db_name: "{{ vault_mysql_db_name }}" diff --git a/group_vars/dev/vars.yml b/group_vars/dev/vars.yml index 2151421..050b85f 100644 --- a/group_vars/dev/vars.yml +++ b/group_vars/dev/vars.yml @@ -12,8 +12,9 @@ wsgi_home: "/opt/regluit/venv" wsgi_python_path: "/opt/regluit/venv/bin/python" git_repo: "https://github.com/Gluejar/regluit.git" git_branch: "lencrypt" -#le_endpoint: https://acme-v02.api.letsencrypt.org/directory -le_endpoint: https://acme-staging-v02.api.letsencrypt.org/directory +le_endpoint: https://acme-v02.api.letsencrypt.org/directory +#le_endpoint: https://acme-staging-v02.api.letsencrypt.org/directory +alt_server_name: "ondeck.unglue.it" ### Variables in settings.prod.py ### diff --git a/group_vars/ondeck/vars.yml b/group_vars/ondeck/vars.yml index 058d334..bab2765 100644 --- a/group_vars/ondeck/vars.yml +++ b/group_vars/ondeck/vars.yml @@ -14,7 +14,7 @@ git_repo: "https://github.com/Gluejar/regluit.git" git_branch: "master" le_endpoint: https://acme-v02.api.letsencrypt.org/directory #le_endpoint: https://acme-staging-v02.api.letsencrypt.org/directory - +alt_server_name: ### Variables in settings.prod.py ### mysql_db_name: "{{ vault_mysql_db_name }}" diff --git a/group_vars/production/vars.yml b/group_vars/production/vars.yml index d512e67..457d332 100644 --- a/group_vars/production/vars.yml +++ b/group_vars/production/vars.yml @@ -13,6 +13,7 @@ wsgi_python_path: "/opt/regluit/venv/bin/python" git_repo: "https://github.com/Gluejar/regluit.git" git_branch: "production" le_endpoint: https://acme-staging-v02.api.letsencrypt.org/directory +alt_server_name: "unglue.it" ### Variables in settings.prod.py ### mysql_db_name: "{{ vault_mysql_db_name }}" diff --git a/roles/regluit_prod/tasks/certs.yml b/roles/regluit_prod/tasks/certs.yml index f5c471f..38b6fc7 100644 --- a/roles/regluit_prod/tasks/certs.yml +++ b/roles/regluit_prod/tasks/certs.yml @@ -51,6 +51,7 @@ acme_directory: "{{ le_endpoint }}" acme_version: 2 remaining_days: 45 + force: no select_crypto_backend: openssl csr: "private/decrypted/{{ server_name }}.csr" dest: private/certs/{{ server_name }}.crt @@ -77,16 +78,24 @@ group: "{{ user_name }}" mode: 0755 -- copy: +- name: copy main challenge + copy: dest: /var/www/static/{{ acme_challenge['challenge_data'][server_name]['http-01']['resource'] }} content: "{{ acme_challenge['challenge_data'][server_name]['http-01']['resource_value'] }}" when: acme_challenge is changed +- name: copy alt challenge + copy: + dest: /var/www/static/{{ acme_challenge['challenge_data'][alt_server_name]['http-01']['resource'] }} + content: "{{ acme_challenge['challenge_data'][alt_server_name]['http-01']['resource_value'] }}" + when: acme_challenge is changed and alt_server_name != '' + - name: Create a challenge for server_name using a account key file. acme_certificate: account_key_src: private/decrypted/letsencrypt_account.key acme_directory: "{{ le_endpoint }}" acme_version: 2 + force: no remaining_days: 45 select_crypto_backend: openssl csr: "private/decrypted/{{ server_name }}.csr"