From 79eef8c8db41678bcc9802c45e82feb9171af47f Mon Sep 17 00:00:00 2001 From: Jeffrey van Pelt Date: Wed, 6 May 2020 22:24:31 +0200 Subject: [PATCH] Updated docs, updated vars files for ara_web and ara_frontend_nginx to support Debian 10 Change-Id: I39827c0113a4b4fd5e74e06df60cd9145352fc95 --- roles/ara_api/vars/Debian.yaml | 1 + roles/ara_api/vars/Ubuntu.yaml | 3 +++ roles/ara_frontend_nginx/vars/Debian.yaml | 1 + roles/ara_web/README.rst | 3 ++- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 roles/ara_api/vars/Debian.yaml create mode 120000 roles/ara_frontend_nginx/vars/Debian.yaml diff --git a/roles/ara_api/vars/Debian.yaml b/roles/ara_api/vars/Debian.yaml new file mode 120000 index 0000000..c81cefb --- /dev/null +++ b/roles/ara_api/vars/Debian.yaml @@ -0,0 +1 @@ +Ubuntu.yaml \ No newline at end of file diff --git a/roles/ara_api/vars/Ubuntu.yaml b/roles/ara_api/vars/Ubuntu.yaml index 72aac05..8eca4cb 100644 --- a/roles/ara_api/vars/Ubuntu.yaml +++ b/roles/ara_api/vars/Ubuntu.yaml @@ -22,6 +22,9 @@ ara_distribution_packages: [] ara_api_required_packages: - git - python3-venv + - python3-setuptools + - python-pkg-resources + - python3-pkg-resources ara_api_postgresql_packages: - postgresql diff --git a/roles/ara_frontend_nginx/vars/Debian.yaml b/roles/ara_frontend_nginx/vars/Debian.yaml new file mode 120000 index 0000000..c81cefb --- /dev/null +++ b/roles/ara_frontend_nginx/vars/Debian.yaml @@ -0,0 +1 @@ +Ubuntu.yaml \ No newline at end of file diff --git a/roles/ara_web/README.rst b/roles/ara_web/README.rst index 158dc1a..47c9c09 100644 --- a/roles/ara_web/README.rst +++ b/roles/ara_web/README.rst @@ -63,9 +63,10 @@ Deploy the ARA API and web client on the same machine with defaults: ara_api_allowed_hosts: - api.ara.example.org ara_api_cors_origin_whitelist: - - web.ara.example.org + - "http://web.ara.example.org" # ara_web ara_web_fqdn: web.ara.example.org + ara_web_frontend_server: nginx ara_web_api_endpoint: "http://api.ara.example.org" roles: - ara_api