Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 3038 → Rev 3039

/alcasar.sh
2189,7 → 2189,6
echo "MAIL_SMTP_IP=" >> $CONF_FILE
echo "MAIL_SMTP_PORT=" >> $CONF_FILE
echo "MAIL_ADDR=" >> $CONF_FILE
echo "MAIL_PASSWORD=" >> $CONF_FILE
echo "MAIL_WHITEDOMAIN=" >> $CONF_FILE
echo "MAIL_ADMIN=" >> $CONF_FILE
echo "BL_PUREIP=on" >> $CONF_FILE
/scripts/alcasar-mail-install.sh
18,11 → 18,12
LOCAL_IPTABLE_FILE="/usr/local/etc/alcasar-iptables-local.sh"
SASLPATH="/etc/postfix/sasl"
smtpIP="0.0.0.0/0"
hostName=`grep ^HOSTNAME= $CONF_FILE|cut -d"=" -f2`
domainName=`grep ^DOMAIN= $CONF_FILE|cut -d"=" -f2`
usage="Usage: alcasar-mail_install.sh -h|-0|-1|-2|-3"
 
nb_args=$#
if [ $nb_args -eq 0 ] # apply alcasar.conf
then
if [ $nb_args -eq 0 ]; then # apply alcasar.conf
mail=`grep ^MAIL= $CONF_FILE|cut -d"=" -f2`
if [ "$mail" = "off" ]; then
TYPE_MAIL=0
31,12 → 32,9
smtpPort=`grep ^MAIL_SMTP_PORT= $CONF_FILE|cut -d"=" -f2`
smtpIP=`grep ^MAIL_SMTP_IP= $CONF_FILE|cut -d"=" -f2`
mailAddr=`grep ^MAIL_ADDR= $CONF_FILE|cut -d"=" -f2`
mailMdp=`grep ^MAIL_PASSWORD= $CONF_FILE|cut -d"=" -f2`
[ -e ${SASLPATH}/sasl_passwd ] && mailMdp=`cat $SASLPATH/sasl_passwd|cut -d":" -f3`
adminMail=`grep ^MAIL_ADMIN= $CONF_FILE|cut -d"=" -f2`
whiteDomain=`grep ^MAIL_WHTEDOMAIN= $CONF_FILE|cut -d"=" -f2`
domainName=`grep ^DOMAIN= $CONF_FILE|cut -d"=" -f2`
hostName=`grep ^HOSTNAME= $CONF_FILE|cut -d"=" -f2`
 
whiteDomain=`grep ^MAIL_WHITEDOMAIN= $CONF_FILE|cut -d"=" -f2`
fi
else # apply args
if [ "$1" = "-h" ] || [ "$1" = "--h" ]; then
93,7 → 91,6
$SED "s/^MAIL_SMTP_IP=.*/MAIL_SMTP_IP=/" $CONF_FILE
$SED "s/^MAIL_SMTP_PORT=.*/MAIL_SMTP_PORT=/" $CONF_FILE
$SED "s/^MAIL_ADDR=.*/MAIL_ADDR=/" $CONF_FILE
$SED "s/^MAIL_PASSWORD=.*/MAIL_PASSWORD=/" $CONF_FILE
$SED "s/^MAIL_WHITEDOMAIN=.*/MAIL_WHITEDOMAIN=/" $CONF_FILE
$SED "s/^MAIL_ADMIN=.*/MAIL_ADMIN=/" $CONF_FILE
$SED "/^SMTP_IP=/ s/^/#/" $LOCAL_IPTABLE_FILE
104,7 → 101,7
$SED "s/^smtp_tls_security_level =.*/smtp_tls_security_level = may/g" $POSTFIX_CONF_FILE
$SED "s/^smtp_tls_wrappermode =.*/smtp_tls_wrappermode = no/g" $POSTFIX_CONF_FILE
$SED "s/^myhostname =.*/myhostname = $hostName.$domainName/g" $POSTFIX_CONF_FILE
[ -e ${SASLPATH}/sasl_passwd ] && rm -f ${SASLPATH}/sasl_passwd
[ -e ${SASLPATH}/sasl_passwd ] && rm -f ${SASLPATH}/*
elif [[ $TYPE_MAIL -eq 1 ]]; then # Enable mail service (act as smtp server)
$SED "s/^MAIL=.*/MAIL=on/" $CONF_FILE
$SED "s/^MAIL_TYPE=.*/MAIL_TYPE=1/" $CONF_FILE
111,10 → 108,12
$SED "s/^MAIL_SMTP_IP=.*/MAIL_SMTP_IP=/" $CONF_FILE
$SED "s/^MAIL_SMTP_PORT=.*/MAIL_SMTP_PORT=$smtpPort/" $CONF_FILE
$SED "s/^MAIL_ADDR=.*/MAIL_ADDR=/" $CONF_FILE
$SED "s/^MAIL_PASSWORD=.*/MAIL_PASSWORD=/" $CONF_FILE
$SED "s/^MAIL_WHITEDOMAIN=.*/MAIL_WHITEDOMAIN=$whiteDomain/" $CONF_FILE
$SED "s/^MAIL_ADMIN=.*/MAIL_ADMIN=$adminMail/" $CONF_FILE
$SED "/^SMTP_IP=/ s/^/#/" $LOCAL_IPTABLE_FILE
$SED "s/^SMTP_PORT=.*/SMTP_PORT=$smtpPort/" $LOCAL_IPTABLE_FILE
$SED "s/^\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT.*/\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT -m conntrack --ctstate NEW,ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT.*/\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT -m conntrack --ctstate ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^#SMTP_PORT=.*/SMTP_PORT=$smtpPort/" $LOCAL_IPTABLE_FILE
$SED "s/^#\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT.*/\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT -m conntrack --ctstate NEW,ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^#\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT.*/\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT -m conntrack --ctstate ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
122,7 → 121,7
$SED "s/^smtp_tls_security_level =.*/smtp_tls_security_level = may/g" $POSTFIX_CONF_FILE
$SED "s/^smtp_tls_wrappermode =.*/smtp_tls_wrappermode = no/g" $POSTFIX_CONF_FILE
$SED "s/^myhostname =.*/myhostname = $hostName.$domainName/g" $POSTFIX_CONF_FILE
[ -e ${SASLPATH}/sasl_passwd ] && rm -f ${SASLPATH}/sasl_passwd
[ -e ${SASLPATH}/sasl_passwd ] && rm -f ${SASLPATH}/*
elif [[ $TYPE_MAIL -eq 2 ]]; then # Enable mail service (relaying to an extern mail server)
$SED "s/^MAIL=.*/MAIL=on/" $CONF_FILE
$SED "s/^MAIL_TYPE=.*/MAIL_TYPE=2/" $CONF_FILE
129,9 → 128,12
$SED "s/^MAIL_SMTP_IP=.*/MAIL_SMTP_IP=$smtpIP/" $CONF_FILE
$SED "s/^MAIL_SMTP_PORT=.*/MAIL_SMTP_PORT=$smtpPort/" $CONF_FILE
$SED "s/^MAIL_ADDR=.*/MAIL_ADDR=/" $CONF_FILE
$SED "s/^MAIL_PASSWORD=.*/MAIL_PASSWORD=/" $CONF_FILE
$SED "s/^MAIL_WHITEDOMAIN=.*/MAIL_WHITEDOMAIN=$whiteDomain/" $CONF_FILE
$SED "s/^MAIL_ADMIN=.*/MAIL_ADMIN=$adminMail/" $CONF_FILE
$SED "s/^SMTP_IP=.*/SMTP_IP=$smtpIP/" $LOCAL_IPTABLE_FILE
$SED "s/^SMTP_PORT=.*/SMTP_PORT=$smtpPort/" $LOCAL_IPTABLE_FILE
$SED "s/^\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT.*/\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT -d \$SMTP_IP -m conntrack --ctstate NEW,ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT.*/\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT -s \$SMTP_IP -m conntrack --ctstate ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^#SMTP_IP=.*/SMTP_IP=$smtpIP/" $LOCAL_IPTABLE_FILE
$SED "s/^#SMTP_PORT=.*/SMTP_PORT=$smtpPort/" $LOCAL_IPTABLE_FILE
$SED "s/^#\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT.*/\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT -d \$SMTP_IP -m conntrack --ctstate NEW,ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
140,7 → 142,7
$SED "s/^smtp_tls_security_level =.*/smtp_tls_security_level = may/g" $POSTFIX_CONF_FILE
$SED "s/^smtp_tls_wrappermode =.*/smtp_tls_wrappermode = no/g" $POSTFIX_CONF_FILE
$SED "s/^myhostname =.*/myhostname = $hostName.$domainName/g" $POSTFIX_CONF_FILE
[ -e ${SASLPATH}/sasl_passwd ] && rm -f ${SASLPATH}/sasl_passwd
[ -e ${SASLPATH}/sasl_passwd ] && rm -f ${SASLPATH}/*
elif [[ $TYPE_MAIL -eq 3 ]]; then # Enable mail service (using an email address)
$SED "s/^MAIL=.*/MAIL=on/" $CONF_FILE
$SED "s/^MAIL_TYPE=.*/MAIL_TYPE=3/" $CONF_FILE
147,9 → 149,12
$SED "s/^MAIL_SMTP_IP=.*/MAIL_SMTP_IP=$smtpIP/" $CONF_FILE
$SED "s/^MAIL_SMTP_PORT=.*/MAIL_SMTP_PORT=$smtpPort/" $CONF_FILE
$SED "s/^MAIL_ADDR=.*/MAIL_ADDR=$mailAddr/" $CONF_FILE
$SED "s/^MAIL_PASSWORD=.*/MAIL_PASSWORD=$mailMdp/" $CONF_FILE
$SED "s/^MAIL_WHITEDOMAIN=.*/MAIL_WHITEDOMAIN=$whiteDomain/" $CONF_FILE
$SED "s/^MAIL_ADMIN=.*/MAIL_ADMIN=$adminMail/" $CONF_FILE
$SED "s/^SMTP_IP=.*/SMTP_IP=$smtpIP/" $LOCAL_IPTABLE_FILE
$SED "s/^SMTP_PORT=.*/SMTP_PORT=$smtpPort/" $LOCAL_IPTABLE_FILE
$SED "s/^\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT.*/\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT -m conntrack --ctstate NEW,ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT.*/\$IPTABLES -A INPUT -p tcp --sport \$SMTP_PORT -m conntrack --ctstate ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
$SED "s/^#SMTP_IP=.*/SMTP_IP=$smtpIP/" $LOCAL_IPTABLE_FILE
$SED "s/^#SMTP_PORT=.*/SMTP_PORT=$smtpPort/" $LOCAL_IPTABLE_FILE
$SED "s/^#\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT.*/\$IPTABLES -A OUTPUT -p tcp --dport \$SMTP_PORT -m conntrack --ctstate NEW,ESTABLISHED -j ACCEPT/" $LOCAL_IPTABLE_FILE
/web/acc/manager/htdocs/user_by_email.php
42,13 → 42,13
$Language = strtolower(substr(chop($Langue[0]), 0, 2));
}
if ($Language === 'fr') {
$l_mail_title = "Inscription par Email";
$l_mail_registration = "Activer l'inscription par Email :";
$l_mail_choice = "Quel type de service mail utiliser ?";
$l_mail_title = "Inscription par e-mail";
$l_mail_registration = "Activer l'inscription par e-mail :";
$l_mail_choice = "Quel type de service e-mail utiliser ?";
$l_use_internal_server = "Utiliser le serveur de messagerie interne";
$l_use_external_server = "Relayer vers un serveur de messagerie externe";
$l_use_email_address = "Utiliser une adresse mail";
$l_email_address = "Adresse mail utilisée pour l'envoi de mail";
$l_use_email_address = "Utiliser une adresse e-mail déjà fonctionnelle";
$l_email_address = "Adresse e-mail utilisée pour l'envoi de mail";
$l_email_password = "Mot de passe";
$l_email_password_confirm = "Confirmez le mot de passe";
$l_mail_service = "Choisissez le service de messagerie";
55,13 → 55,13
$l_mail_smtp_ip = "Adresse IP ou nom du serveur SMTP";
$l_mail_smtp_port = "Port d'écoute du serveur SMTP";
$l_admin_log = "Avertissement de l'administratateur";
$l_mail_admin = "Adresse Email de l'administrateur";
$l_mail_admin = "Adresse e-mail de l'administrateur";
$l_whitelist_domain = "Noms de domaine autorisés (whitelist)";
$l_mail_YES = "OUI";
$l_mail_NO = "NON";
$l_mail_submit = "Enregistrer";
} else if($Language == 'es') {
$l_mail_title = "Registro por email";
$l_mail_title = "Registro por e-mail";
$l_mail_registration = "Activar el registro por correo electrónico :";
$l_mail_choice = "Qué tipo de servicio de correo utiliza?";
$l_use_internal_server = "Utilizar el servidor de correo interno";
80,9 → 80,9
$l_mail_NO = "NO";
$l_mail_submit = "SI";
} else {
$l_mail_title = "Registration by Email";
$l_mail_registration = "Enable registration by Email :";
$l_mail_choice = "What type of mail service use ?";
$l_mail_title = "Registration by e-mail";
$l_mail_registration = "Enable registration by e-mail :";
$l_mail_choice = "What type of e-mail service use ?";
$l_use_internal_server = "Use the internal mail server";
$l_use_external_server = "Relay to an external mail server";
$l_use_email_address = "Use an email address";
103,11 → 103,11
// Mail configuration params
$mail_status = $conf['MAIL'];
$mail_type = $conf['MAIL_TYPE'];
$mail_address = $conf['MAIL_ADDR'];
$mail_smtp_ip = $conf['MAIL_SMTP_IP'];
$mail_smtp_port = $conf['MAIL_SMTP_PORT'];
$mail_password_mail = "";
$mail_password_mail_2 = "";
$mail_address = $conf['MAIL_ADDR'];
$mail_mdp = "";
$mail_mdp2 = "";
$mail_admin = $conf['MAIL_ADMIN'];
$mail_whitelist = $conf['MAIL_WHITEDOMAIN'];
 
314,7 → 314,7
<label for="mail_address"><?= $l_email_address ?></label><br>
</dt>
<dd>
<input type="text" id="mail_address" size="40" name="mail_address" value="<?= $mail_address ?>" oninput="onMailStatusChange();">
<input type="text" id="mail_address" size="40" name="mail_address" value="<?= $mail_address ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>
322,7 → 322,7
<label for="mail_mdp"><?= $l_email_password ?></label><br>
</dt>
<dd>
<input type="password" id="mail_mdp" size="40" name="mail_mdp" value="<?= $mail_password_mail ?>" oninput="onMailStatusChange();">
<input type="password" id="mail_mdp" size="40" name="mail_mdp" value="<?= $mail_mdp ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>
330,7 → 330,7
<label for="mail_mdp2"><?= $l_email_password_confirm ?></label><br>
</dt>
<dd>
<input type="password" id="mail_mdp2" size="40" name="mail_mdp2" value="<?= $mail_password_mail_2 ?>" oninput="onMailStatusChange();">
<input type="password" id="mail_mdp2" size="40" name="mail_mdp2" value="<?= $mail_mdp2 ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>
356,13 → 356,13
<label for="mail_smtp_ip"><?= $l_mail_smtp_ip ?></label><br>
</dt>
<dd>
<input type="text" id="mail_smtp_ip" size="40" name="mail_smtp_ip" value="<?= $mail_smtp_ip ?>" oninput="onMailStatusChange();">
<input type="text" id="mail_smtp_ip" size="40" name="mail_smtp_ip" value="<?= $mail_smtp_ip ?>" oninput="onMailStatusChange();">
</dd>
<dt>
<label for="mail_smtp_port"><?= $l_mail_smtp_port ?></label><br>
</dt>
<dd>
<input type="text" id="mail_smtp_port" size="5" name="mail_smtp_port" value="<?= $mail_smtp_port ?>" oninput="onMailStatusChange();">
<input type="text" id="mail_smtp_port" size="5" name="mail_smtp_port" value="<?= $mail_smtp_port ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>
381,7 → 381,7
<label for="mail_admin"><?= $l_mail_admin ?></label><br>
</dt>
<dd>
<input type="text" id="mail_admin" size="40" name="mail_admin" value="<?= $mail_admin ?>" oninput="onMailStatusChange();">
<input type="text" id="mail_admin" size="40" name="mail_admin" value="<?= $mail_admin ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<dl>
389,7 → 389,7
<label for="mail_whitelist"><?= $l_whitelist_domain ?></label><br>
</dt>
<dd>
<input type="text" id="mail_whitelist" size="40" name="mail_whitelist" value="<?= $mail_whitelist ?>" oninput="onMailStatusChange();">
<input type="text" id="mail_whitelist" size="40" name="mail_whitelist" value="<?= $mail_whitelist ?>" oninput="onMailStatusChange();">
</dd>
</dl>
<p>