Fix database paths (#45)

Author: Ndpnt

CHANGELOG.md

@@ -2,7 +2,12 @@
 
 All changes that impact users of this module are documented in this file, in the [Common Changelog](https://common-changelog.org) format with some additional specifications defined in the CONTRIBUTING file. This codebase adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## Unreleased [patch]
+
+### Fixed
+
+- Set up the Git-based databases at the proper locations
+- Make refined playbook execution work with the `infrastructure` tag
 
 ## 2.0.0 - 2024-05-31
 

playbooks/deploy.yml

@@ -3,14 +3,18 @@
   hosts: all
   tasks:
     - name: Load OTA applications configs
+      tags: [always]
       ansible.builtin.include_role:
         name: ota/apps
         public: true # ensure that the role's variables and defaults are accessible to the play
+        apply:
+          tags: [always]
       vars:
         ota_apps_read_config_only: true
 
     - name: Set required variables
-      set_fact:
+      tags: [always]
+      ansible.builtin.set_fact:
         chromium_required: "{{ ota_apps_config['@opentermsarchive/engine'] is defined }}"
         # Skip Debian 11 with ARM architecture as it is not currently supported by MongoDB; see https://www.mongodb.com/docs/manual/installation/#supported-platforms
         mongo_required:
@@ -23,26 +27,26 @@
             ) | bool 
           }}"
 
-        snapshots_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository is defined and ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository }}"
-        snapshots_path: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.path is defined and ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.path }}"
-        
-        versions_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository is defined and ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository }}"
-        versions_path: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.path is defined and ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.path }}"
-        
-        collection_api_basePath: "{{ ota_apps_config['@opentermsarchive/engine']['collection-api'].basePath is defined and ota_apps_config['@opentermsarchive/engine']['collection-api'].basePath }}"
-        collection_api_port: "{{ ota_apps_config['@opentermsarchive/engine']['collection-api'].port is defined and ota_apps_config['@opentermsarchive/engine']['collection-api'].port }}"
-        
-        federation_api_basePath: "{{ ota_apps_config['@opentermsarchive/federation-api'].basePath is defined and ota_apps_config['@opentermsarchive/federation-api'].basePath }}"
-        federation_api_port: "{{ ota_apps_config['@opentermsarchive/federation-api'].port is defined and ota_apps_config['@opentermsarchive/federation-api'].port }}"
-    
+        snapshots_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository | default(None) }}"
+        snapshots_relative_path: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.path | default(None) }}"
+
+        versions_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository | default(None) }}"
+        versions_relative_path: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.path | default(None) }}"
+
+        collection_api_basePath: "{{ ota_apps_config['@opentermsarchive/engine']['collection-api'].basePath | default(None) }}"
+        collection_api_port: "{{ ota_apps_config['@opentermsarchive/engine']['collection-api'].port | default(None) }}"
+
+        federation_api_basePath: "{{ ota_apps_config['@opentermsarchive/federation-api'].basePath | default(None) }}"
+        federation_api_port: "{{ ota_apps_config['@opentermsarchive/federation-api'].port | default(None) }}"
+
     - name: Install infrastructure
       become: true
       tags: [infrastructure]
       block:
         - name: Install Node
           ansible.builtin.include_role:
             name: node
-        
+
         - name: Install PM2
           ansible.builtin.include_role:
             name: pm2/install
@@ -52,10 +56,10 @@
             name: chromium
           when: chromium_required
 
-        - name: Install Nginx 
+        - name: Install Nginx
           ansible.builtin.include_role:
             name: nginx/install
-      
+
         - name: Install Mongo
           ansible.builtin.include_role:
             name: mongo/install
@@ -69,26 +73,26 @@
           become: true
       when:
         - mongo_required
-  
+
     - name: Setup Git-based versions database
       ansible.builtin.include_role:
         name: ota/git_database
       vars:
         ota_git_database_repository: "{{ versions_repository }}"
-        ota_git_database_directory: "{{ versions_path }}"
+        ota_git_database_directory: /home/{{ ansible_user }}/{{ ota_directory }}/{{ versions_relative_path }}
         ota_git_database_branch: main
       when:
-        - versions_repository and versions_path
+        - versions_repository and versions_relative_path
 
     - name: Setup Git-based snapshots database
       ansible.builtin.include_role:
         name: ota/git_database
       vars:
         ota_git_database_repository: "{{ snapshots_repository }}"
-        ota_git_database_directory: "{{ snapshots_path }}"
+        ota_git_database_directory: /home/{{ ansible_user }}/{{ ota_directory }}/{{ snapshots_relative_path }}
         ota_git_database_branch: main
       when:
-        - snapshots_repository and snapshots_path
+        - snapshots_repository and snapshots_relative_path
 
     - name: Setup OTA applications
       ansible.builtin.include_role:

roles/github/tasks/main.yml

@@ -22,5 +22,5 @@
   with_items: # GitHub's SSH key fingerprints can be found here: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints
     - github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
     - github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-    - github.com ssh-rsa 
+    - github.com ssh-rsa
       AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=

roles/mongo/configure/tasks/main.yml

@@ -2,21 +2,21 @@
 - name: Configure MongoDB
   notify: Restart MongoDB
   block:
-  - name: Add mongod.conf
-    ansible.builtin.copy:
-      src: mongod.conf
-      dest: /etc/mongod.conf
-      mode: "644"
+    - name: Add mongod.conf
+      ansible.builtin.copy:
+        src: mongod.conf
+        dest: /etc/mongod.conf
+        mode: "644"
 
-  - name: Create data directory
-    ansible.builtin.file:
-      path: /mnt/disk/mongodb
-      state: directory
-      mode: "744"
+    - name: Create data directory
+      ansible.builtin.file:
+        path: /mnt/disk/mongodb
+        state: directory
+        mode: "744"
 
-  - name: Set database files permissions
-    ansible.builtin.file:
-      path: /mnt/disk/mongodb
-      owner: mongodb
-      group: mongodb
-      recurse: true
+    - name: Set database files permissions
+      ansible.builtin.file:
+        path: /mnt/disk/mongodb
+        owner: mongodb
+        group: mongodb
+        recurse: true

tests/inventory.yml

@@ -1,4 +1,4 @@
-vagrant:
+all:
   hosts:
     vagrant: # Name the host instead of using 127.0.0.1 to ensure `delegate_to` distinguishes between the local machine and the locally running Vagrant VM
       ansible_user: vagrant