From 4eb599fc9c4998e9d0e7dd145da7bbe24dcfd017 Mon Sep 17 00:00:00 2001
From: Tunui Franken <tfranken@protonmail.com>
Date: Fri, 5 Jan 2024 18:36:05 +0100
Subject: [PATCH] Rename srv-mail => mailserver

---
 Vagrantfile                                      | 6 +++---
 inventory.ini                                    | 4 ++--
 playbook_ispmail.yml => playbook_mailserver.yml  | 4 ++--
 roles/{mail_server => mailserver}/README.md      | 2 +-
 roles/{mail_server => mailserver}/tasks/main.yml | 0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename playbook_ispmail.yml => playbook_mailserver.yml (71%)
 rename roles/{mail_server => mailserver}/README.md (75%)
 rename roles/{mail_server => mailserver}/tasks/main.yml (100%)

diff --git a/Vagrantfile b/Vagrantfile
index 9413268..fd1dc56 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,8 +6,8 @@ Vagrant.configure("2") do |config|
     lime2.vm.box = "debian/bookworm64"
     lime2.vm.hostname = "lime2-test"
   end
-  config.vm.define "srvmail-test" do |srvmail|
-    srvmail.vm.box = "debian/bookworm64"
-    srvmail.vm.hostname = "srvmail-test"
+  config.vm.define "mailserver-test" do |mailserver|
+    mailserver.vm.box = "debian/bookworm64"
+    mailserver.vm.hostname = "mailserver-test"
   end
 end
diff --git a/inventory.ini b/inventory.ini
index 36dfd07..e810edc 100644
--- a/inventory.ini
+++ b/inventory.ini
@@ -1,4 +1,4 @@
 lime2
 lime2-test remote_user=vagrant
-srvmail
-srvmail-test remote_user=vagrant
+mailserver
+mailserver-test remote_user=vagrant
diff --git a/playbook_ispmail.yml b/playbook_mailserver.yml
similarity index 71%
rename from playbook_ispmail.yml
rename to playbook_mailserver.yml
index bd0e8b1..b56174f 100644
--- a/playbook_ispmail.yml
+++ b/playbook_mailserver.yml
@@ -4,6 +4,6 @@
 
 - name: Install mail server
   gather_facts: true
-  hosts: srvmail,srvmail-test
+  hosts: mailserver,mailserver-test
   roles:
-    - mail_server
+    - mailserver
diff --git a/roles/mail_server/README.md b/roles/mailserver/README.md
similarity index 75%
rename from roles/mail_server/README.md
rename to roles/mailserver/README.md
index 36d27a8..0c61b76 100644
--- a/roles/mail_server/README.md
+++ b/roles/mailserver/README.md
@@ -1,3 +1,3 @@
-# mail_server
+# mailserver
 
 Installs the SMTP part of the mail server.
diff --git a/roles/mail_server/tasks/main.yml b/roles/mailserver/tasks/main.yml
similarity index 100%
rename from roles/mail_server/tasks/main.yml
rename to roles/mailserver/tasks/main.yml