From ec6de426d611397acc99ef54538fe985578dd2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= <jdubois@evolix.fr>
Date: Wed, 12 Oct 2022 16:45:56 +0200
Subject: [PATCH] base: reordering default variable file and deleting unused
 one

---
 CHANGELOG                    |  1 +
 roles/base/defaults/main.yml | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8ea0a4a..ae8e5bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * base: fstab options can be activated or not
 * base: configure "/usr/X11R6" and "/usr/local" for servers that have a mount on it
 * base: we can chose to deploy or not utils files
+* base: reordering default variable file and deleting unused one
 
 ### Fixed
 
diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index c641289..67da1ef 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -1,19 +1,27 @@
 # yamllint disable rule:line-length
 ---
-ntpd_servers: "ntp.evolix.net"
-
-general_alert_email: "root@localhost"
-general_technical_realm: "example.com"
 
+# dotfiles.yml
 evobsd_system_timeout: 36000
 evobsd_path: "$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+
+# mail.yml
+general_alert_email: "root@localhost"
+
+# cron.yml
 cron_root_path: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 
+# ntp.yml
+ntpd_servers: "ntp.evolix.net"
+
+# fstab.yml
 evobsd_fstab_softdep: true
 evobsd_fstab_noatime: true
 evobsd_fstab_noexec: true
 
-install_url: "https://cdn.openbsd.org/pub/OpenBSD"
-
+# utils.yml
 evobsd_updateevobackupcanary_include: true
 evobsd_dumpserverstate_include: true
+
+# packages.yml
+install_url: "https://cdn.openbsd.org/pub/OpenBSD"