テキスト比較

2 つのテキストファイルの違いを見つける

表示

レイアウト

ライブエディター空白の変更を非表示未変更行を折りたたむ折り返しなし

比較精度

構文

処理

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

create_mail_user_SQL.sh

作成日 7 年前差分は期限切れになりません

4 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

110 行

7 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

110 行

#!/usr/bin/env bash

# Author: Zhang Huangbin (zhb _at_ iredmail.org)

# Purpose: Import users to SQL database from plain text file.

# Project: iRedMail (http://www.iredmail.org/)

# -------------------------------------------------------------------

# Usage:

# * Edit these variables:

# STORAGE_BASE_DIRECTORY

# DEFAULT_QUOTA='1024' # 1024 is 1GB

# * Run this script to generate SQL command used to create new user.

# # bash create_mail_user_SQL.sh user@domain.ltd plain_password

# # bash create_mail_user_SQL.sh user@domain.ltd plain_password mail_quota

# It will print SQL commands on console directly, you can redirect the

# output to a file for further use like this:

# # bash create_mail_user_SQL.sh user@domain.ltd plain_password > output.sql

# # bash create_mail_user_SQL.sh user@domain.ltd plain_password mail_quota > output.sql

# * Import output.sql into SQL database like below:

# # mysql -uroot -p

# mysql> USE vmail;

# mysql> SOURCE /path/to/output.sql;

# # psql -d vmail

# sql> \i /path/to/output.sql;

# --------- CHANGE THESE VALUES ----------

# Storage base directory used to store users' mail.

STORAGE_BASE_DIRECTORY="/var/vmail/vmail1"

###########

# Password

# Password scheme. Available schemes: BCRYPT, SSHA512, SSHA, MD5, NTLM, PLAIN.

# Check file Available

PASSWORD_SCHEME='SSHA512'

# Default mail quota (in MB).

DEFAULT_QUOTA='1024'

DEFAULT_QUOTA=$3

# Maildir settings

# Maildir style: hashed, normal.

# Hashed maildir style, so that there won't be many large directories

# in your mail storage file system. Better performance in large scale

# deployment.

# Format: e.g. username@domain.td

# hashed -> domain.ltd/u/us/use/username/

# normal -> domain.ltd/username/

# Default hash level is 3.

MAILDIR_STYLE='hashed' # hashed, normal.

if [ X"$#" != X'2' ]; then

if [ X"$#" != X'3' ]; then

echo "Invalid command arguments. Usage:"

echo "bash create_mail_user_SQL.sh user@domain.ltd plain_password"

echo "bash create_mail_user_SQL.sh user@domain.ltd plain_password mail_quota"

exit 255

# Time stamp, will be appended in maildir.

DATE="$(date +%Y.%m.%d.%H.%M.%S)"

WC_L='wc -L'

if [ X"$(uname -s)" == X'OpenBSD' ]; then

WC_L='wc -l'

STORAGE_BASE="$(dirname ${STORAGE_BASE_DIRECTORY})"

STORAGE_NODE="$(basename ${STORAGE_BASE_DIRECTORY})"

# Read input

mail="$1"

plain_password="$2"

username="$(echo $mail | awk -F'@' '{print $1}')"

domain="$(echo $mail | awk -F'@' '{print $2}')"

# Cyrpt default password.

export CRYPT_PASSWD="$(python ./generate_password_hash.py ${PASSWORD_SCHEME} ${plain_password})"

# Different maildir style: hashed, normal.

if [ X"${MAILDIR_STYLE}" == X"hashed" ]; then

length="$(echo ${username} | ${WC_L} )"

str1="$(echo ${username} | cut -c1)"

str2="$(echo ${username} | cut -c2)"

str3="$(echo ${username} | cut -c3)"

test -z "${str2}" && str2="${str1}"

test -z "${str3}" && str3="${str2}"

# Use mbox, will be changed later.

maildir="${domain}/${str1}/${str2}/${str3}/${username}-${DATE}/"

else

maildir="${domain}/${username}-${DATE}/"

cat <<EOF

保存された差分

原文

ファイルを開く

#!/usr/bin/env bash

# Author:   Zhang Huangbin (zhb _at_ iredmail.org)
# Purpose:  Import users to SQL database from plain text file.
# Project:  iRedMail (http://www.iredmail.org/)

# -------------------------------------------------------------------
# Usage:
#   * Edit these variables:
#       STORAGE_BASE_DIRECTORY
#       DEFAULT_QUOTA='1024'   # 1024 is 1GB
#
#   * Run this script to generate SQL command used to create new user.
#
#       # bash create_mail_user_SQL.sh user@domain.ltd plain_password
#
#     It will print SQL commands on console directly, you can redirect the
#     output to a file for further use like this:
#
#       # bash create_mail_user_SQL.sh user@domain.ltd plain_password > output.sql
#
#   * Import output.sql into SQL database like below:
#
#       # mysql -uroot -p
#       mysql> USE vmail;
#       mysql> SOURCE /path/to/output.sql;
#
#       # psql -d vmail
#       sql> \i /path/to/output.sql;

# --------- CHANGE THESE VALUES ----------
# Storage base directory used to store users' mail.
STORAGE_BASE_DIRECTORY="/var/vmail/vmail1"

###########
# Password
#
# Password scheme. Available schemes: BCRYPT, SSHA512, SSHA, MD5, NTLM, PLAIN.
# Check file Available
PASSWORD_SCHEME='SSHA512'

# Default mail quota (in MB).
DEFAULT_QUOTA='1024'

#
# Maildir settings
#
# Maildir style: hashed, normal.
# Hashed maildir style, so that there won't be many large directories
# in your mail storage file system. Better performance in large scale
# deployment.
# Format: e.g. username@domain.td
#   hashed  -> domain.ltd/u/us/use/username/
#   normal  -> domain.ltd/username/
# Default hash level is 3.
MAILDIR_STYLE='hashed'      # hashed, normal.

if [ X"$#" != X'2' ]; then
    echo "Invalid command arguments. Usage:"
    echo "bash create_mail_user_SQL.sh user@domain.ltd plain_password"
    exit 255
fi

# Time stamp, will be appended in maildir.
DATE="$(date +%Y.%m.%d.%H.%M.%S)"
WC_L='wc -L'
if [ X"$(uname -s)" == X'OpenBSD' ]; then
    WC_L='wc -l'
fi

STORAGE_BASE="$(dirname ${STORAGE_BASE_DIRECTORY})"
STORAGE_NODE="$(basename ${STORAGE_BASE_DIRECTORY})"

# Read input
mail="$1"
plain_password="$2"

username="$(echo $mail | awk -F'@' '{print $1}')"
domain="$(echo $mail | awk -F'@' '{print $2}')"

# Cyrpt default password.
export CRYPT_PASSWD="$(python ./generate_password_hash.py ${PASSWORD_SCHEME} ${plain_password})"

# Different maildir style: hashed, normal.
if [ X"${MAILDIR_STYLE}" == X"hashed" ]; then
    length="$(echo ${username} | ${WC_L} )"
    str1="$(echo ${username} | cut -c1)"
    str2="$(echo ${username} | cut -c2)"
    str3="$(echo ${username} | cut -c3)"

test -z "${str2}" && str2="${str1}"
    test -z "${str3}" && str3="${str2}"

# Use mbox, will be changed later.
    maildir="${domain}/${str1}/${str2}/${str3}/${username}-${DATE}/"
else
    maildir="${domain}/${username}-${DATE}/"
fi

cat <<EOF
INSERT INTO mailbox (username, password, name,
                     storagebasedirectory,storagenode, maildir,
                     quota, domain, active, passwordlastchange, created)
             VALUES ('${mail}', '${CRYPT_PASSWD}', '${username}',
                     '${STORAGE_BASE}','${STORAGE_NODE}', '${maildir}',
                     '${DEFAULT_QUOTA}', '${domain}', '1', NOW(), NOW());
INSERT INTO forwardings (address, forwarding, domain, dest_domain, is_forwarding)
                 VALUES ('${mail}', '${mail}','${domain}', '${domain}', 1);
EOF

変更されたテキスト

ファイルを開く

#!/usr/bin/env bash

# Author:   Zhang Huangbin (zhb _at_ iredmail.org)
# Purpose:  Import users to SQL database from plain text file.
# Project:  iRedMail (http://www.iredmail.org/)

# -------------------------------------------------------------------
# Usage:
#   * Edit these variables:
#       STORAGE_BASE_DIRECTORY
#       DEFAULT_QUOTA='1024'   # 1024 is 1GB
#
#   * Run this script to generate SQL command used to create new user.
#
#       # bash create_mail_user_SQL.sh user@domain.ltd plain_password mail_quota
#
#     It will print SQL commands on console directly, you can redirect the
#     output to a file for further use like this:
#
#       # bash create_mail_user_SQL.sh user@domain.ltd plain_password mail_quota > output.sql
#
#   * Import output.sql into SQL database like below:
#
#       # mysql -uroot -p
#       mysql> USE vmail;
#       mysql> SOURCE /path/to/output.sql;
#
#       # psql -d vmail
#       sql> \i /path/to/output.sql;

# --------- CHANGE THESE VALUES ----------
# Storage base directory used to store users' mail.
STORAGE_BASE_DIRECTORY="/var/vmail/vmail1"

###########
# Password
#
# Password scheme. Available schemes: BCRYPT, SSHA512, SSHA, MD5, NTLM, PLAIN.
# Check file Available
PASSWORD_SCHEME='SSHA512'

# Default mail quota (in MB).
DEFAULT_QUOTA=$3

if [ X"$#" != X'3' ]; then
    echo "Invalid command arguments. Usage:"
    echo "bash create_mail_user_SQL.sh user@domain.ltd plain_password mail_quota"
    exit 255
fi

# Time stamp, will be appended in maildir.
DATE="$(date +%Y.%m.%d.%H.%M.%S)"
WC_L='wc -L'
if [ X"$(uname -s)" == X'OpenBSD' ]; then
    WC_L='wc -l'
fi

STORAGE_BASE="$(dirname ${STORAGE_BASE_DIRECTORY})"
STORAGE_NODE="$(basename ${STORAGE_BASE_DIRECTORY})"

# Read input
mail="$1"
plain_password="$2"

username="$(echo $mail | awk -F'@' '{print $1}')"
domain="$(echo $mail | awk -F'@' '{print $2}')"

# Cyrpt default password.
export CRYPT_PASSWD="$(python ./generate_password_hash.py ${PASSWORD_SCHEME} ${plain_password})"

test -z "${str2}" && str2="${str1}"
    test -z "${str3}" && str3="${str2}"

# Use mbox, will be changed later.
    maildir="${domain}/${str1}/${str2}/${str3}/${username}-${DATE}/"
else
    maildir="${domain}/${username}-${DATE}/"
fi

cat <<EOF
INSERT INTO mailbox (username, password, name,
                     storagebasedirectory,storagenode, maildir,
                     quota, domain, active, passwordlastchange, created)
             VALUES ('${mail}', '${CRYPT_PASSWD}', "$(echo ${username} | awk '{print toupper(substr($0,0,1))tolower(substr($0,2))}')",
                     '${STORAGE_BASE}','${STORAGE_NODE}', '${maildir}',
                     '${DEFAULT_QUOTA}', '${domain}', '1', NOW(), NOW());
INSERT INTO forwardings (address, forwarding, domain, dest_domain, is_forwarding)
                 VALUES ('${mail}', '${mail}','${domain}', '${domain}', 1);
EOF