From a7d3164ba116b22204439e0e8839083e1fb732b2 Mon Sep 17 00:00:00 2001 From: Christopher Blanchard Date: Mon, 8 Apr 2019 15:27:36 +0200 Subject: [PATCH] Amplify installation fixes (#113) * Remove syntax error When evaluated (i.e. when nginx_amplify_enable=true and nginx_amplify_api_key is defined) this line causes a syntax error To check for empty string, opted for temporary solution outlined in https://github.com/ansible/ansible-lint/issues/457 * Fix reference to amplify api key Previously was labelled `amplify_api_key`. Changed to `nginx_amplify_api_key` in #a55a50d * Fix reference to default config file On my system at least (bionic), the default configuration file is `/etc/amplify-agent/agent.conf.default` This is also assumed be to the case on the amplify install shell script https://github.com/nginxinc/nginx-amplify-agent/blob/master/packages/install.sh#L526 --- tasks/amplify/install-amplify.yml | 6 +++--- tasks/main.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/amplify/install-amplify.yml b/tasks/amplify/install-amplify.yml index 16c0a30..9204abf 100644 --- a/tasks/amplify/install-amplify.yml +++ b/tasks/amplify/install-amplify.yml @@ -13,12 +13,12 @@ - name: "(Setup: All OSs) Copy NGINX Configurator Agent Configuration Template" copy: remote_src: yes - src: /etc/amplify-agent/agent.configurator.conf.default - dest: /etc/amplify-agent/agent.configurator.conf + src: /etc/amplify-agent/agent.conf.default + dest: /etc/amplify-agent/agent.conf - name: "(Setup: All OSs) Configure NGINX Amplify Agent API Key" lineinfile: dest: /etc/amplify-agent/agent.conf regexp: api_key =.* - line: "api_key = {{ amplify_api_key }}" + line: "api_key = {{ nginx_amplify_api_key }}" notify: "(Handler: All OSs) Start NGINX Amplify Agent" diff --git a/tasks/main.yml b/tasks/main.yml index 436a8ba..a5d6ef8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -58,7 +58,7 @@ when: - nginx_amplify_enable - nginx_amplify_api_key is defined - - nginx_amplify_api_key + - nginx_amplify_api_key | length > 0 - import_tasks: controller/install-controller.yml when: