Merge pull request '1.0.29' (#16) from testing into main

Reviewed-on: #16

galaxy.yml

@@ -8,7 +8,7 @@ namespace: jchristianh
 name: baseos
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.28
+version: 1.0.29
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

roles/motd/defaults/main.yml

@@ -7,5 +7,7 @@ motd_host_uptime   : "{{ now().replace(microsecond=0) - now().fromtimestamp(now(
 motd_day_filter    : "(.* day[s]?),\\s+(\\d+):(\\d+):(\\d+)"
 motd_nonday_filter : "(\\d+):(\\d+):(\\d+)"
 
+motd_day_filter_repl    : "\\1 \\2 hours \\3 minutes"
+motd_nonday_filter_repl : "\\1 hours \\2 minutes \\3 seconds"
 
 ...

roles/motd/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 - name: Format uptime containing days
   ansible.builtin.set_fact:
-    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_day_filter, '\\1 \\2 hours \\3 minutes') }}"
+    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}"
   when:
     - "'day' in motd_host_uptime"
 
 
 - name: Format uptime not containing days
   ansible.builtin.set_fact:
-    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_nonday_filter, '\\1 hours \\2 minutes \\3 seconds') }}"
+    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_nonday_filter, motd_nonday_filter_repl) }}"
   when:
     - "'day' not in motd_host_uptime"