diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2017-03-17 14:25:52 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2017-03-17 16:59:41 +0000 |
| commit | 0335db6b8c261d76de8c5a00e212ea54b27a007e (patch) | |
| tree | b07f649ce2a543581d51ae499b7b11eecf247074 /baserock_trove | |
| parent | e35304470813a4d0afde456414d684f9a74e7036 (diff) | |
| download | infrastructure-0335db6b8c261d76de8c5a00e212ea54b27a007e.tar.gz | |
baserock_trove: Adapt for new certs
Diffstat (limited to 'baserock_trove')
| -rw-r--r-- | baserock_trove/configure-trove.yml | 10 | ||||
| -rw-r--r-- | baserock_trove/trove.conf | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/baserock_trove/configure-trove.yml b/baserock_trove/configure-trove.yml index 2f3434cd..a86ee7cd 100644 --- a/baserock_trove/configure-trove.yml +++ b/baserock_trove/configure-trove.yml @@ -16,19 +16,19 @@ tasks: # To create the .pem file, simply concatenate - # certs/baserock.org-ssl-certificate-temporary-dsilverstone.full.cert with + # certs/git.pem with # the private key for that certificate (which is not committed to Git, of # course). - name: Install SSL certificate copy: - content: "{{ lookup('file', '../private/baserock.org-ssl-certificate-temporary-dsilverstone.pem') }}" + content: "{{ lookup('file', '../private/git-with-key.pem') }}" dest: /etc/trove/baserock.pem mode: 400 - name: Install CA chain certificate copy: - src: ../certs/startcom-class2-ca-chain-certificate.cert - dest: /etc/trove/startcom-ca.pem + src: ../certs/letsencrypt-ca.pem + dest: /etc/trove/letsencrypt-ca.pem - name: Install trove.conf configuration file copy: @@ -37,7 +37,7 @@ - name: Copy ssh keys copy: - content: "{{ lookup('file', '../private/{{ item }}') }}" + content: "{{ lookup('file', '../private/{{ item }}') }}\n" dest: /etc/trove/{{ item }} with_items: - admin.key.pub diff --git a/baserock_trove/trove.conf b/baserock_trove/trove.conf index 4de7cd19..98fe8c3d 100644 --- a/baserock_trove/trove.conf +++ b/baserock_trove/trove.conf @@ -11,4 +11,4 @@ TROVE_HOSTNAME: git.baserock.org TROVE_ID: baserock WORKER_SSH_PUBKEY: /etc/trove/worker.key.pub TROVE_SSL_PEMFILE: /etc/trove/baserock.pem -TROVE_SSL_CA_FILE: /etc/trove/startcom-ca.pem +TROVE_SSL_CA_FILE: /etc/trove/letsencrypt-ca.pem |