default ubuntu 18.04 to use cron

voxpupuli · Jan 10, 2025 · 966e710 · 966e710
1 parent 37fd2ee
commit 966e710
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/data/Ubuntu/18.04.yaml b/data/Ubuntu/18.04.yaml
@@ -0,0 +1,5 @@
+---
+logrotate::ensure_cron_daily: present
+logrotate::ensure_cron_hourly: present
+logrotate::manage_systemd_timer: false
+logrotate::ensure_systemd_timer: absent
diff --git a/hiera.yaml b/hiera.yaml
@@ -6,11 +6,14 @@ defaults:
   data_hash: yaml_data
 
 hierarchy:
-  - name: 'Distribution Name'
-    path: "%{facts.os.name}.yaml"
-  - name: 'Operating System Family - Major version'
-    path: "%{facts.os.family}/%{facts.os.release.major}.yaml"
+  - name: 'Operating System Family - Major Release'
+    paths:
+     # Used to distinguish between Debian and Ubuntu
+      - "%{facts.os.name}/%{facts.os.release.major}.yaml"
+      - "%{facts.os.family}/%{facts.os.release.major}.yaml"
   - name: 'Operating System Family'
-    path: "%{facts.os.family}.yaml"
+    paths:
+      - "%{facts.os.name}.yaml"
+      - "%{facts.os.family}.yaml"
   - name: 'defaults'
     path: 'defaults.yaml'