From ffb05a728a5bda3b19d7b591c339d6e4f8973a5e Mon Sep 17 00:00:00 2001 From: Sebastien Date: Fri, 30 Jul 2021 16:58:08 +0200 Subject: [PATCH 01/10] test --- zimbra/acme.sh/test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 zimbra/acme.sh/test diff --git a/zimbra/acme.sh/test b/zimbra/acme.sh/test new file mode 100644 index 0000000..e69de29 From 0a4638fd7b3d045d765dfa4b079c5b9d9f0913eb Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 1 Sep 2021 10:14:53 +0200 Subject: [PATCH 02/10] delete test --- Nextcloud/imports-account-csv.sh | 1 + zimbra/acme.sh/test | 0 2 files changed, 1 insertion(+) create mode 100644 Nextcloud/imports-account-csv.sh delete mode 100644 zimbra/acme.sh/test diff --git a/Nextcloud/imports-account-csv.sh b/Nextcloud/imports-account-csv.sh new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/Nextcloud/imports-account-csv.sh @@ -0,0 +1 @@ +test diff --git a/zimbra/acme.sh/test b/zimbra/acme.sh/test deleted file mode 100644 index e69de29..0000000 From dc86b0281368df12682b0964c0be674ae17f483d Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 1 Sep 2021 10:16:48 +0200 Subject: [PATCH 03/10] ver 1.0 --- Nextcloud/imports-account-csv.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Nextcloud/imports-account-csv.sh b/Nextcloud/imports-account-csv.sh index 9daeafb..01d8e0b 100644 --- a/Nextcloud/imports-account-csv.sh +++ b/Nextcloud/imports-account-csv.sh @@ -1 +1,22 @@ -test + #!/bin/bash +input="accountsn.csv" +OLDIFS=$IFS +IFS=',' +var_apache_user=www-data +var_path_nextcloud=/usr/share/nginx/nextcloud/ +var_result_file="${var_datum}_user_create.txt" +while read -r display_name username group password email +do + + var_display_name=$(echo $display_name ) + var_username=$(echo $username ) + var_group=$(echo $group ) + var_password=$(echo $password ) + var_email=$(echo $email ) + echo "resultat :" + echo ${var_username} + export OC_PASS={$var_password} + su -s /bin/sh ${var_apache_user} -c " php ${var_path_nextcloud}occ user:add --display-name='${var_display_name}' --password-from-env --group='${var_group}' '${var_username}' " + +done < $input +IFS=$OLDIFS From 0e2fbbfe1c38a65217116541384d90f8eb9aaeb6 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 1 Sep 2021 10:40:26 +0200 Subject: [PATCH 04/10] Ver 1.1 --- Nextcloud/imports-account-csv.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Nextcloud/imports-account-csv.sh b/Nextcloud/imports-account-csv.sh index 01d8e0b..7754b86 100644 --- a/Nextcloud/imports-account-csv.sh +++ b/Nextcloud/imports-account-csv.sh @@ -1,10 +1,9 @@ - #!/bin/bash +#!/bin/bash input="accountsn.csv" OLDIFS=$IFS IFS=',' var_apache_user=www-data var_path_nextcloud=/usr/share/nginx/nextcloud/ -var_result_file="${var_datum}_user_create.txt" while read -r display_name username group password email do @@ -13,10 +12,10 @@ do var_group=$(echo $group ) var_password=$(echo $password ) var_email=$(echo $email ) - echo "resultat :" - echo ${var_username} - export OC_PASS={$var_password} - su -s /bin/sh ${var_apache_user} -c " php ${var_path_nextcloud}occ user:add --display-name='${var_display_name}' --password-from-env --group='${var_group}' '${var_username}' " + + echo "account : ${email}" + export OC_PASS={$var_password} + su -s /bin/sh ${var_apache_user} -c " php ${var_path_nextcloud}occ user:add --display-name='${var_display_name}' --password-from-env --group='${var_group}' '${var_username}' " done < $input IFS=$OLDIFS From 1af310bcc14271a29df30826798089ef2babfaca Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 1 Sep 2021 11:00:07 +0200 Subject: [PATCH 05/10] Certificat zimbra --- zimbra/{ => certificat}/ca-root.pem | 0 zimbra/{ => certificat}/script-certificat.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename zimbra/{ => certificat}/ca-root.pem (100%) rename zimbra/{ => certificat}/script-certificat.sh (100%) diff --git a/zimbra/ca-root.pem b/zimbra/certificat/ca-root.pem similarity index 100% rename from zimbra/ca-root.pem rename to zimbra/certificat/ca-root.pem diff --git a/zimbra/script-certificat.sh b/zimbra/certificat/script-certificat.sh similarity index 100% rename from zimbra/script-certificat.sh rename to zimbra/certificat/script-certificat.sh From adb4848e4e82ea7f4d4b14f823298d9f0ca7a509 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 1 Sep 2021 11:05:34 +0200 Subject: [PATCH 06/10] zimbra Import account with CSV ver 1.0 --- .../import_account_with_csv.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 zimbra/import_export_accounts/import_account_with_csv.sh diff --git a/zimbra/import_export_accounts/import_account_with_csv.sh b/zimbra/import_export_accounts/import_account_with_csv.sh new file mode 100644 index 0000000..d6f8cc5 --- /dev/null +++ b/zimbra/import_export_accounts/import_account_with_csv.sh @@ -0,0 +1,24 @@ +#!/bin/bash +DATE=$(date) +OLDIFS=$IFS +IFS=',' +File_Name="accounts.csv" +Out_log='/tmp/outfile.log' + echo "$DATE - To create account Email" | tee $Out_log + echo "Account, Password, First_Name, Last_Name, DisplayName, zimbraMailHost" | tee -a $Out_log +while read Acount_Email Password First_Name Last_Name Display_Name Mailbox +do + echo "$Acount_Email, $Password, $First_Name, $Last_Name, $Display_Name, $Mailbox" | tee -a $Out_log + echo "" +Uid=$(echo $Acount_Email | cut -d '@' -f1) +Domain=$(echo $Acount_Email | cut -d '@' -f2) +su - zimbra -c "zmprov -l gaa | grep '\b$Uid'@$Domain" +if [ $? -eq 0 ] ; then + echo "$Acount_Email exits" +else + su - zimbra -c "zmprov ca '$Acount_Email' '$Password' givenName '$First_Name' sn '$Last_Name' displayName '$Display_Name' zimbraMailHost '$Mailbox' zimbraPasswordMustChange TRUE " >>$Out_log +fi + +done < ${File_Name} +IFS=$OLDIFS +#option "zimbraPasswordMustChange TRUE" pour l'obligation de changement du mot de passe lors de la premiere connexion From 70581898dc23bcc3557a6a59fc18d49923c6d50e Mon Sep 17 00:00:00 2001 From: Sebastien Date: Mon, 6 Sep 2021 14:55:53 +0200 Subject: [PATCH 07/10] update Nextcloud to nextcloud --- {Nextcloud => nextcloud}/imports-account-csv.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {Nextcloud => nextcloud}/imports-account-csv.sh (100%) diff --git a/Nextcloud/imports-account-csv.sh b/nextcloud/imports-account-csv.sh similarity index 100% rename from Nextcloud/imports-account-csv.sh rename to nextcloud/imports-account-csv.sh From 29c571e3813af22666a8822b6266ba5c7a0f2b5c Mon Sep 17 00:00:00 2001 From: Julien Escario Date: Mon, 6 Sep 2021 14:57:44 +0200 Subject: [PATCH 08/10] Added source of puppet agent bash profile --- foreman/altinea_puppet_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/foreman/altinea_puppet_install.sh b/foreman/altinea_puppet_install.sh index cd113ba..95e2f64 100644 --- a/foreman/altinea_puppet_install.sh +++ b/foreman/altinea_puppet_install.sh @@ -8,3 +8,4 @@ echo "[agent] pluginsync = true report = true"> /etc/puppetlabs/puppet/puppet.conf /opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true +. /etc/profile.d/puppet-agent.sh From 05a66df6d5229c0e0988c6f8c2c1996f872441ee Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 9 Sep 2021 11:04:05 +0200 Subject: [PATCH 09/10] imap_sync_script Ver 1.0 --- .../imaps_sync_script.sh | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 zimbra/import_export_accounts/imaps_sync_script.sh diff --git a/zimbra/import_export_accounts/imaps_sync_script.sh b/zimbra/import_export_accounts/imaps_sync_script.sh new file mode 100644 index 0000000..efde359 --- /dev/null +++ b/zimbra/import_export_accounts/imaps_sync_script.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +echo "Saisir le fichier de comptes :" +read input +echo "Saisir le Host1 :" +read host1 +echo "Saisir le Port1 :" +read port1 +echo "Saisir le Host2 :" +read host2 +echo "Saisir le port2 :" +read Port2 + +echo "Info host 1 : ${host1} ${port1}" +echo "Info host 2 : ${host2} ${port2}" +option1="--syncinternaldates" +option2="--buffersize 65535000" +option3="--nofoldersizes" +option4="--nofoldersizesatend" +option5="--addheader" + +OLDIFS=$IFS +IFS=' ' +while read -r account_host1 password_host1 account_host2 password_host2 +do + + var_acc_host1=$(echo $account_host1) + var_pass_host1=$(echo $password_host1) + var_acc_host2=$(echo $account_host2) + var_pass_host2=$(echo $password_host2) + echo "migration du compte : ${var_acc_host2}" + docker run --rm gilleslamiral/imapsync imapsync --host1 ${host1} --user1 ${var_acc_host1} --password1 ${var_pass_host1} --port1 ${port1} --notls1 --host2 ${host2} --user2 ${var_acc_host2} --password2 ${var_pass_host2} ${option1} ${option2} --port2=993 --ssl2 ${option3} ${option4} ${option5} + +done < $input +IFS=$OLDIFS From f764d3114fbd97b3bb70f45ba261c42bc5f52b81 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Fri, 10 Sep 2021 14:02:54 +0200 Subject: [PATCH 10/10] renew cert zimbra acme.sh ver 1.0 --- zimbra/certificat/renew_cert_acmesh_zimbra.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 zimbra/certificat/renew_cert_acmesh_zimbra.sh diff --git a/zimbra/certificat/renew_cert_acmesh_zimbra.sh b/zimbra/certificat/renew_cert_acmesh_zimbra.sh new file mode 100644 index 0000000..2c396aa --- /dev/null +++ b/zimbra/certificat/renew_cert_acmesh_zimbra.sh @@ -0,0 +1,34 @@ +su zimbra /opt/zimbra/bin/zmproxyctl stop +/root/.acme.sh/acme.sh --issue --standalone -d replace_host +cd /etc/myacme/replace_host/ +mkdir /opt/zimbra/ssl/letsencrypt +echo '-----BEGIN CERTIFICATE----- +MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow +PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD +Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O +rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq +OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b +xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw +7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD +aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG +SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 +ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr +AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz +R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 +JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo +Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ +-----END CERTIFICATE-----' >> fullchain.cer +cp /etc/myacme/replace_host/* /opt/zimbra/ssl/letsencrypt/ +chown zimbra:zimbra /opt/zimbra/ssl/letsencrypt/* +chown zimbra:zimbra /opt/zimbra/ssl/letsencrypt/ +cp -a /opt/zimbra/ssl/zimbra /opt/zimbra/ssl/zimbra.$(date "+%Y%m%d") +cp /opt/zimbra/ssl/letsencrypt/replace_host.key /opt/zimbra/ssl/zimbra/commercial/commercial.key +su - zimbra -c " +cd /opt/zimbra/ssl/letsencrypt/ +/opt/zimbra/bin/zmcertmgr verifycrt comm replace_host.key replace_host.cer fullchain.cer +/opt/zimbra/bin/zmcertmgr deploycrt comm replace_host.cer fullchain.cer +zmcontrol restart"