From c23e24193659c78d4d49c96e9979575dc97329ea Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 28 Oct 2020 18:59:34 -0400
Subject: [PATCH] Cleaner mongodb/tasks/install.yml

---
 roles/mongodb/tasks/install.yml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index 8a858b310..851e987ef 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -19,7 +19,7 @@
   - name: Download & unzip 20MB http://download.iiab.io/packages/mongodb_stretch_3_0_14_core.zip to /tmp/mongodb-3.0.1x (aarch32)
     unarchive:
       remote_src: yes
-      src: "{{ iiab_download_url }}/mongodb_stretch_3_0_14_core.zip"
+      src: "{{ iiab_download_url }}/mongodb_stretch_3_0_14_core.zip"    # http://download.iiab.io/packages
       dest: /tmp/mongodb-3.0.1x
 
   - name: Install (move) its 3 CORE binaries from /tmp/mongodb-3.0.1x/core to /usr/bin (aarch32)
@@ -47,24 +47,22 @@
       home: /var/lib/mongodb
       shell: /usr/sbin/nologin
 
-  - name: Install /etc/mongod.conf from template (aarch32)
+  - name: Install {{ mongodb_conf }} from template (aarch32)
     template:
-      src: "{{ item.src }}"
-      dest: "{{ item.dest }}"
+      src: mongod.conf.j2
+      dest: "{{ mongodb_conf }}"    # /etc/mongod.conf
       owner: root
       group: root
-      mode: "{{ item.mode }}"
-    with_items:
-      - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}", mode: '0644' }    # i.e. /etc/mongod.conf
+      mode: 0644
 
   # end block
   when: not (ansible_architecture == "x86_64" or ansible_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
-# see bootable 32bit intel installers for a while now.
-# 64 bit OS's proceed below.
+# 32-bit OS's are handled above: this should handle aarch32 including 32-bit Ubuntu
+# from https://ubuntu.com/download/raspberry-pi but Ubuntu 20.04 32-bit might fail
+# untested, and 32-bit Intel might puke as this was orginally deployed for Raspbian.
+# (Haven't seen bootable 32-bit Intel installers for a while now.)
+# 64-bit OS's proceed below.
 
 - block:
   - name: Add mongodb.org signing key (only 64-bit support available)
@@ -116,12 +114,12 @@
         - mongodb-org-server
       state: present
 
-  - name: Change the mongodb port to 27018
+  - name: Change {{ mongodb_conf }} port to {{ mongodb_port }}
     lineinfile:
-      path: /etc/mongod.conf
-      regexp: 'port: 27017'
+      path: "{{ mongodb_conf }}"
+      regexp: "port: 27017"
       backrefs: yes
-      line: '  port: 27018'
+      line: "  port: {{ mongodb_port }}"    # 27018
 
   # end block
   when: (ansible_architecture == "aarch64") or (ansible_architecture == "x86_64")
@@ -154,7 +152,7 @@
 
 # daemon_reload is used to force systemd to recognize a newly installed .service file
 # restarted here to ensure the port has been changed
-- name: Disable 'mongodb' systemd service - started on demand by sugarizer
+- name: Disable 'mongodb' systemd service - started on demand by Sugarizer
   systemd:
     name: mongodb
     daemon_reload: yes