From a566280039c3c51592788ecfaa2dffbd09fde063 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:45:21 +0100
Subject: [PATCH 01/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/1=5Fexport=5Faccounts.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/1_export_accounts.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zimbra/Migration/1_export_accounts.sh b/zimbra/Migration/1_export_accounts.sh
index 97ad635..a9f1355 100644
--- a/zimbra/Migration/1_export_accounts.sh
+++ b/zimbra/Migration/1_export_accounts.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
 
 echo "Saisir le domaine :"
 read DOM

From f041491559beb51e0b800858207fea25a4e59af1 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:45:35 +0100
Subject: [PATCH 02/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/2=5Fimport=5Faccounts.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/2_import_accounts.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zimbra/Migration/2_import_accounts.sh b/zimbra/Migration/2_import_accounts.sh
index c5405a1..cc9e047 100644
--- a/zimbra/Migration/2_import_accounts.sh
+++ b/zimbra/Migration/2_import_accounts.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
 
 echo "Importation des comptes :"
 PASSWORDS="passwords"

From b18ec32489a98fa109861189e4a93390972015c5 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:45:53 +0100
Subject: [PATCH 03/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/3=5Fexports=5Ffinal.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/3_exports_final.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zimbra/Migration/3_exports_final.sh b/zimbra/Migration/3_exports_final.sh
index 59398c9..2b61d3b 100644
--- a/zimbra/Migration/3_exports_final.sh
+++ b/zimbra/Migration/3_exports_final.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
 
 echo "Export mailboxes :"
 for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`;

From 88d0a6bf94f2bda0fa57e287674cadb0d8e4f4c1 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:46:17 +0100
Subject: [PATCH 04/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/3=5Fexports=5Fmailboxes.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/3_exports_mailboxes.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zimbra/Migration/3_exports_mailboxes.sh b/zimbra/Migration/3_exports_mailboxes.sh
index 481e416..6a5144e 100644
--- a/zimbra/Migration/3_exports_mailboxes.sh
+++ b/zimbra/Migration/3_exports_mailboxes.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
 
 echo "Export mailboxes :"
 for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`;

From fd1b1d00cdbab68f04af2d7879ed1dd7af2c137b Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:46:37 +0100
Subject: [PATCH 05/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/4=5Fimports=5Fmailboxes.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/4_imports_mailboxes.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zimbra/Migration/4_imports_mailboxes.sh b/zimbra/Migration/4_imports_mailboxes.sh
index 33163b8..16ce8f7 100644
--- a/zimbra/Migration/4_imports_mailboxes.sh
+++ b/zimbra/Migration/4_imports_mailboxes.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
 
 for mailbox in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`;
 do

From 46bcacc2223ce2d03a896659d9757292268b3b93 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:46:56 +0100
Subject: [PATCH 06/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/5=5Fexports=5Ffilters=5Fand=5Fsig.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/5_exports_filters_and_sig.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/zimbra/Migration/5_exports_filters_and_sig.sh b/zimbra/Migration/5_exports_filters_and_sig.sh
index 4c32097..3977dbb 100644
--- a/zimbra/Migration/5_exports_filters_and_sig.sh
+++ b/zimbra/Migration/5_exports_filters_and_sig.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
+
  echo "Export des Filtres"
  for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`; do echo "Exporting Filters : $user" ; zmprov ga  $user zimbraMailSieveScript > filters/$user-filters.txt ;done
  sed -i -e "1d" /opt/zimbra/nfsbackup/migration/filters/*

From 07a63bba33399bb5473675bafa10945f5a6dfb6f Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:47:15 +0100
Subject: [PATCH 07/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/6=5Fimports=5Ffilters=5Fand=5Fsig.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/6_imports_filters_and_sig.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/zimbra/Migration/6_imports_filters_and_sig.sh b/zimbra/Migration/6_imports_filters_and_sig.sh
index e205e8a..7a351cb 100644
--- a/zimbra/Migration/6_imports_filters_and_sig.sh
+++ b/zimbra/Migration/6_imports_filters_and_sig.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 RCODE=$?
+if [ ! whoami = "zimbra" ]; then
+
+ echo "Le user doit être zimbra, pas root ! "
+ exit 1;
+
+fi
 
  echo "Import des Filtres"
  for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`; do echo "Importation des filtres : $user"; zmprov ma $user zimbraMailSieveScript  "`cat /opt/zimbra/nfsbackup/migration/filters/$user-filters.txt`";done

From 5ca96ec5ece8c90e141928059d742872d9bdfd4c Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:59:03 +0100
Subject: [PATCH 08/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/6=5Fimports=5Ffilters=5Fand=5Fsig.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/6_imports_filters_and_sig.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/6_imports_filters_and_sig.sh b/zimbra/Migration/6_imports_filters_and_sig.sh
index 7a351cb..c40923d 100644
--- a/zimbra/Migration/6_imports_filters_and_sig.sh
+++ b/zimbra/Migration/6_imports_filters_and_sig.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
+
 
-fi
 
  echo "Import des Filtres"
  for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`; do echo "Importation des filtres : $user"; zmprov ma $user zimbraMailSieveScript  "`cat /opt/zimbra/nfsbackup/migration/filters/$user-filters.txt`";done

From f99736b89d63407d3bb932638fa9fa42e528783b Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:59:18 +0100
Subject: [PATCH 09/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/5=5Fexports=5Ffilters=5Fand=5Fsig.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/5_exports_filters_and_sig.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/5_exports_filters_and_sig.sh b/zimbra/Migration/5_exports_filters_and_sig.sh
index 3977dbb..e2d01bb 100644
--- a/zimbra/Migration/5_exports_filters_and_sig.sh
+++ b/zimbra/Migration/5_exports_filters_and_sig.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
 
-fi
 
  echo "Export des Filtres"
  for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`; do echo "Exporting Filters : $user" ; zmprov ga  $user zimbraMailSieveScript > filters/$user-filters.txt ;done

From 929c2629349f552f4505922ccbf28c42cbc46237 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:59:33 +0100
Subject: [PATCH 10/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/4=5Fimports=5Fmailboxes.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/4_imports_mailboxes.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/4_imports_mailboxes.sh b/zimbra/Migration/4_imports_mailboxes.sh
index 16ce8f7..84d25eb 100644
--- a/zimbra/Migration/4_imports_mailboxes.sh
+++ b/zimbra/Migration/4_imports_mailboxes.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
 
-fi
 
 for mailbox in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`;
 do

From cac388a6dbbf37221664deef5836bd7f0a681395 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 15:59:47 +0100
Subject: [PATCH 11/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/3=5Fexports=5Fmailboxes.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/3_exports_mailboxes.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/3_exports_mailboxes.sh b/zimbra/Migration/3_exports_mailboxes.sh
index 6a5144e..acbc7d0 100644
--- a/zimbra/Migration/3_exports_mailboxes.sh
+++ b/zimbra/Migration/3_exports_mailboxes.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
 
-fi
 
 echo "Export mailboxes :"
 for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`;

From 77cdaa753711897fb9147372dc9f7e4209d1baa2 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 16:00:01 +0100
Subject: [PATCH 12/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/3=5Fexports=5Ffinal.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/3_exports_final.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/3_exports_final.sh b/zimbra/Migration/3_exports_final.sh
index 2b61d3b..b374620 100644
--- a/zimbra/Migration/3_exports_final.sh
+++ b/zimbra/Migration/3_exports_final.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
 
-fi
 
 echo "Export mailboxes :"
 for user in `cat /opt/zimbra/nfsbackup/migration/accounts/users.txt`;

From 2199898b1b177aaf1cc3c5374d4f48cdf63560d8 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 16:00:13 +0100
Subject: [PATCH 13/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/2=5Fimport=5Faccounts.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/2_import_accounts.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/2_import_accounts.sh b/zimbra/Migration/2_import_accounts.sh
index cc9e047..87460c2 100644
--- a/zimbra/Migration/2_import_accounts.sh
+++ b/zimbra/Migration/2_import_accounts.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
 
-fi
 
 echo "Importation des comptes :"
 PASSWORDS="passwords"

From 0af49eae9e88d983047bfcad2dfb5304e3ab9a80 Mon Sep 17 00:00:00 2001
From: "nicolas.fort" <nicolas.fort@noreply.localhost>
Date: Fri, 29 Mar 2024 16:00:29 +0100
Subject: [PATCH 14/14] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'zimbra/Migra?=
 =?UTF-8?q?tion/1=5Fexport=5Faccounts.sh'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zimbra/Migration/1_export_accounts.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zimbra/Migration/1_export_accounts.sh b/zimbra/Migration/1_export_accounts.sh
index a9f1355..9bc5785 100644
--- a/zimbra/Migration/1_export_accounts.sh
+++ b/zimbra/Migration/1_export_accounts.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 RCODE=$?
-if [ ! whoami = "zimbra" ]; then
+if [ $(id -u) -eq 0 ]
+then
+   echo "Ce script ne doit pas être lancé en tant que root"
+      exit 1
+      fi
 
- echo "Le user doit être zimbra, pas root ! "
- exit 1;
 
-fi
 
 echo "Saisir le domaine :"
 read DOM