dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[local/dovecot-user-add] ~correction champ from du courriel de bienvenu
[lhc/ateliers.git]
/
local
/
dovecot-user-add
diff --git
a/local/dovecot-user-add
b/local/dovecot-user-add
index
5e9c35f
..
822a690
100755
(executable)
--- a/
local/dovecot-user-add
+++ b/
local/dovecot-user-add
@@
-16,8
+16,8
@@
first_valid_gid=30000
IFS=@ read -r user domain <<-EOF
$1
EOF
IFS=@ read -r user domain <<-EOF
$1
EOF
-test "${user:+set
"
}"
-test "${domain:+set
"
}"
+test "${user:+set}"
+test "${domain:+set}"
shift
# setup_nss
shift
# setup_nss
@@
-46,7
+46,7
@@
shift
sudo chmod -t ~mail/acl/dovecot."$domain"
# NOTE: permet les mv shared.db{.lock,} effectués par dovecot
sudo chmod -t ~mail/acl/dovecot."$domain"
# NOTE: permet les mv shared.db{.lock,} effectués par dovecot
- sudo install -d -o mail -g php
5
_roundcube -m 1770 \
+ sudo install -d -o mail -g php_roundcube -m 1770 \
/etc/dovecot/dovecot."$domain"
sudo install -d -o mail -g postfix -m 750 \
/etc/mail/dovecot
/etc/dovecot/dovecot."$domain"
sudo install -d -o mail -g postfix -m 750 \
/etc/mail/dovecot
@@
-161,6
+161,8
@@
shift
sudo install -d -o "$uid" -g "$gid" -m 2770 \
"$home" \
"$home"/Maildir
sudo install -d -o "$uid" -g "$gid" -m 2770 \
"$home" \
"$home"/Maildir
+ sudo install -d -o "$uid" -g "$gid" -m 2770 \
+ "$home"/Maildir/.Trash
sudo install -d -o "$uid" -g "$gid" -m 0700 \
"$home"/acl.d \
"$home"/sieve.d
sudo install -d -o "$uid" -g "$gid" -m 0700 \
"$home"/acl.d \
"$home"/sieve.d
@@
-177,7
+179,7
@@
shift
if test "${welcome_mail:+set}"
then
mail \
if test "${welcome_mail:+set}"
then
mail \
- -
S from=
postmaster@"$local_domainname" \
+ -
r
postmaster@"$local_domainname" \
-s "Bienvenue $user@$domain" \
"$user"@"$domain" <<-EOF
Bienvenue $user@$domain,
-s "Bienvenue $user@$domain" \
"$user"@"$domain" <<-EOF
Bienvenue $user@$domain,
@@
-201,5
+203,5
@@
shift
!!
EOF
sort -k 1,1 -t : |
!!
EOF
sort -k 1,1 -t : |
- sudo install -o php
5_roundcube -g php5
_roundcube -m 0640 /dev/stdin "$new_passwd"
+ sudo install -o php
_roundcube -g php
_roundcube -m 0640 /dev/stdin "$new_passwd"
sudo mv -f "$new_passwd" "$old_passwd"
sudo mv -f "$new_passwd" "$old_passwd"