From b6640f813dc539f3c044dfdbe3a715e64619a669 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 27 Aug 2020 19:11:24 -0500 Subject: [PATCH 1/4] debian-10 is using postgresql@ --- roles/postgresql/tasks/install.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/roles/postgresql/tasks/install.yml b/roles/postgresql/tasks/install.yml index eb77dcac9..535bb1794 100644 --- a/roles/postgresql/tasks/install.yml +++ b/roles/postgresql/tasks/install.yml @@ -80,6 +80,21 @@ state: stopped enabled: no +- name: Disable & Stop stock 'postgresql@11-main.service' systemd service - debian-10 + systemd: + name: postgresql@11-main.service + state: stopped + enabled: no +# when: is_debian_10 + when: is_debian_10 and not is_raspbian + +- name: Disable & Stop stock 'postgresql@' systemd service - debian-10 + systemd: + name: postgresql@ + enabled: no +# when: is_debian_10 + when: is_debian_10 and not is_raspbian + # RECORD PostgreSQL AS INSTALLED From 6f49cef3d9ae81f823dc3c138d033687adee0e51 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 27 Aug 2020 19:19:48 -0500 Subject: [PATCH 2/4] mongodb - use ansible_distribution_release to track ubuntu --- roles/mongodb/tasks/install.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml index a31396a54..6fdbc4a34 100644 --- a/roles/mongodb/tasks/install.yml +++ b/roles/mongodb/tasks/install.yml @@ -79,19 +79,19 @@ when: is_debian_10 and (ansible_architecture == "x86_64") # Debian 10 aarch64 might work below but is blocked in main.yml - - name: Add mongodb repo for Ubuntu 18 64bit or Raspbian-aarch64 + - name: Add mongodb repo for RaspOS-aarch64 apt_repository: repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse state: present filename: mongodb-org - when: (ansible_architecture == "aarch64" and is_raspbian_10) or is_ubuntu_18 + when: (ansible_architecture == "aarch64" and is_raspbian_10) - - name: Add mongodb repo for Ubuntu 20 64bit + - name: Add mongodb repo for Ubuntu 64bit only apt_repository: - repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse + repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse state: present filename: mongodb-org - when: is_ubuntu_20 + when: is_ubuntu - name: "Install packages: mongodb-org, mongodb-org-server" package: From 90eea1a31145c7742cf54f766349ad42e0db0610 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 27 Aug 2020 19:29:53 -0500 Subject: [PATCH 3/4] use ansible_userspace_architecture for booted 64bit kernels and 32bit userspace --- roles/mongodb/tasks/install.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml index 6fdbc4a34..95d7a6a79 100644 --- a/roles/mongodb/tasks/install.yml +++ b/roles/mongodb/tasks/install.yml @@ -59,7 +59,7 @@ # end block - when: not (ansible_architecture == "x86_64" or ansible_architecture == "aarch64") + when: not (ansible_userspace_architecture == "x86_64" or ansible_userspace_architecture == "aarch64") # 32 bit OS's get caught above should handle aarch32 including 32-bit ubuntu # from https://ubuntu.com/download/raspberry-pi. 20.4-32bit might fail untested # 32bit intel might puke as this was orginally deployed for raspbian. Haven't @@ -76,7 +76,7 @@ repo: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main state: present filename: mongodb-org - when: is_debian_10 and (ansible_architecture == "x86_64") + when: is_debian_10 and (ansible_userspace_architecture == "x86_64") # Debian 10 aarch64 might work below but is blocked in main.yml - name: Add mongodb repo for RaspOS-aarch64 @@ -84,7 +84,7 @@ repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse state: present filename: mongodb-org - when: (ansible_architecture == "aarch64" and is_raspbian_10) + when: (ansible_userspace_architecture == "aarch64" and is_raspbian_10) - name: Add mongodb repo for Ubuntu 64bit only apt_repository: @@ -108,7 +108,7 @@ line: ' port: 27018' # end block - when: (ansible_architecture == "aarch64") or (ansible_architecture == "x86_64") + when: (ansible_userspace_architecture == "aarch64") or (ansible_userspace_architecture == "x86_64") # 2. CONFIGURE MongoDB FOR IIAB From 63b70c11ce2ae52b55abc55ad1e652f12ac944b7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 27 Aug 2020 19:31:49 -0500 Subject: [PATCH 4/4] osm - always gather what is needed to start the app correctly --- roles/osm-vector-maps/tasks/install.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 5b9f529e4..fb73fe0dd 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -94,13 +94,11 @@ src: '{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles' dest: '{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles' state: link - when: osm_vector_maps_enabled | bool - name: Copy the map abbreviated satellite images get_url: url: "{{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles" dest: '{{ vector_map_path }}/viewer/tiles/satellite_z0-z6_v3.mbtiles' - when: osm_vector_maps_enabled | bool - name: Fetch the javascript bundle for map installer get_url: