Fixed #1295, replaced yourdomain.com with example.com

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2023-05-25 19:00:51 +02:00
parent 85e925a6ae
commit c2b20a01eb
9 changed files with 23 additions and 23 deletions

View File

@ -60,7 +60,7 @@ Be sure to apply util/db-upgrade.sql
- [BUGFIX] Refactored the smtp timeout check - [BUGFIX] Refactored the smtp timeout check
- Obsoleted the LDAP port parameter. Specify the ldap host in the form - Obsoleted the LDAP port parameter. Specify the ldap host in the form
of protocol://hostname:port, eg. ldaps://ldap.yourdomain.com:636 of protocol://hostname:port, eg. ldaps://ldap.example.com:636
1.3.10: 1.3.10:
------- -------

View File

@ -42,8 +42,8 @@ $config['DEFAULT_LANG'] = 'en';
$config['THEME'] = 'default'; $config['THEME'] = 'default';
$config['SITE_NAME'] = 'piler.yourdomain.com'; $config['SITE_NAME'] = 'piler.example.com';
$config['SITE_URL'] = 'http://piler.yourdomain.com/'; $config['SITE_URL'] = 'http://piler.example.com/';
$config['EXTERNAL_DASHBOARD_URL'] = ''; $config['EXTERNAL_DASHBOARD_URL'] = '';
@ -83,7 +83,7 @@ $config['WKHTMLTOPDF_COMMAND'] = "wkhtmltopdf";
// authentication against an ldap directory (disabled by default) // authentication against an ldap directory (disabled by default)
$config['ENABLE_LDAP_AUTH'] = 0; $config['ENABLE_LDAP_AUTH'] = 0;
$config['LDAP_HOST'] = 'ldap.yourdomain.com'; $config['LDAP_HOST'] = 'ldap.example.com';
$config['LDAP_HELPER_DN'] = 'cn=....'; $config['LDAP_HELPER_DN'] = 'cn=....';
$config['LDAP_HELPER_PASSWORD'] = 'xxxxxxx'; $config['LDAP_HELPER_PASSWORD'] = 'xxxxxxx';
$config['LDAP_MAIL_ATTR'] = 'mail'; $config['LDAP_MAIL_ATTR'] = 'mail';
@ -114,9 +114,9 @@ $config['LDAP_MAIL_ATTR'] = 'proxyAddresses';
//$config['LDAP_MAIL_ATTR'] = 'mail'; //$config['LDAP_MAIL_ATTR'] = 'mail';
// iredmail specific settings // iredmail specific settings
//$config['LDAP_HELPER_DN'] = 'cn=vmailadmin,dc=yourdomain,dc=com'; //$config['LDAP_HELPER_DN'] = 'cn=vmailadmin,dc=example,dc=com';
//$config['LDAP_ACCOUNT_OBJECTCLASS'] = 'mailUser'; //$config['LDAP_ACCOUNT_OBJECTCLASS'] = 'mailUser';
//$config['LDAP_BASE_DN'] = 'o=domains,dc=yourdomain,dc=com'; //$config['LDAP_BASE_DN'] = 'o=domains,dc=example,dc=com';
//$config['LDAP_DISTRIBUTIONLIST_OBJECTCLASS'] = 'mailList'; //$config['LDAP_DISTRIBUTIONLIST_OBJECTCLASS'] = 'mailList';
//$config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'memberOfGroup'; //$config['LDAP_DISTRIBUTIONLIST_ATTR'] = 'memberOfGroup';
//$config['LDAP_MAIL_ATTR'] = 'mail'; //$config['LDAP_MAIL_ATTR'] = 'mail';
@ -139,14 +139,14 @@ $config['ENABLE_IMAP_AUTH'] = 0;
$config['RESTORE_OVER_IMAP'] = 0; $config['RESTORE_OVER_IMAP'] = 0;
$config['IMAP_RESTORE_FOLDER_INBOX'] = 'INBOX'; $config['IMAP_RESTORE_FOLDER_INBOX'] = 'INBOX';
$config['IMAP_RESTORE_FOLDER_SENT'] = 'Sent'; $config['IMAP_RESTORE_FOLDER_SENT'] = 'Sent';
$config['IMAP_HOST'] = 'mail.yourdomain.com'; $config['IMAP_HOST'] = 'mail.example.com';
$config['IMAP_PORT'] = 993; $config['IMAP_PORT'] = 993;
$config['IMAP_SSL'] = true; $config['IMAP_SSL'] = true;
// enable authentication against a pop3 server (disabled by default) // enable authentication against a pop3 server (disabled by default)
$config['ENABLE_POP3_AUTH'] = 0; $config['ENABLE_POP3_AUTH'] = 0;
$config['POP3_HOST'] = 'mail.yourdomain.com'; $config['POP3_HOST'] = 'mail.example.com';
$config['POP3_PORT'] = 995; $config['POP3_PORT'] = 995;
$config['POP3_SSL'] = true; $config['POP3_SSL'] = true;
@ -206,9 +206,9 @@ $config['SMARTHOST'] = '';
$config['SMARTHOST_PORT'] = 25; $config['SMARTHOST_PORT'] = 25;
$config['SMARTHOST_USER'] = ''; $config['SMARTHOST_USER'] = '';
$config['SMARTHOST_PASSWORD'] = ''; $config['SMARTHOST_PASSWORD'] = '';
$config['SMTP_DOMAIN'] = 'yourdomain.com'; $config['SMTP_DOMAIN'] = 'example.com';
$config['SMTP_FROMADDR'] = 'no-reply@yourdomain.com'; $config['SMTP_FROMADDR'] = 'no-reply@example.com';
$config['ADMIN_EMAIL'] = 'admin@yourdomain.com'; $config['ADMIN_EMAIL'] = 'admin@example.com';
$config['PILER_HEADER_FIELD'] = 'X-piler-id: '; $config['PILER_HEADER_FIELD'] = 'X-piler-id: ';

View File

@ -6,7 +6,7 @@ set -o nounset
set -x set -x
MY_IP="1.2.3.4" MY_IP="1.2.3.4"
PILER_HOSTNAME="${PILER_HOSTNAME:-archive.yourdomain.com}" PILER_HOSTNAME="${PILER_HOSTNAME:-archive.example.com}"
MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-abcde123}" MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-abcde123}"
MYSQL_PILER_PASSWORD="${MYSQL_PILER_PASSWORD:-piler123}" MYSQL_PILER_PASSWORD="${MYSQL_PILER_PASSWORD:-piler123}"
SERVER_ID="${SERVER_ID:-0}" SERVER_ID="${SERVER_ID:-0}"
@ -148,7 +148,7 @@ fix_configs() {
fi fi
if [[ ! -f /etc/piler/piler.conf ]]; then if [[ ! -f /etc/piler/piler.conf ]]; then
sed -e "s/verystrongpassword/$MYSQL_PILER_PASSWORD/g" -e "s/piler.yourdomain.com/$PILER_HOSTNAME/g" /etc/piler/piler.conf.dist > /etc/piler/piler.conf sed -e "s/verystrongpassword/$MYSQL_PILER_PASSWORD/g" -e "s/piler.example.com/$PILER_HOSTNAME/g" /etc/piler/piler.conf.dist > /etc/piler/piler.conf
chmod 600 /etc/piler/piler.conf chmod 600 /etc/piler/piler.conf
chown $PILER_USER:$PILER_USER /etc/piler/piler.conf chown $PILER_USER:$PILER_USER /etc/piler/piler.conf
fi fi

View File

@ -6,7 +6,7 @@ set -o nounset
set -x set -x
MY_IP="1.2.3.4" MY_IP="1.2.3.4"
PILER_HOSTNAME="${PILER_HOSTNAME:-archive.yourdomain.com}" PILER_HOSTNAME="${PILER_HOSTNAME:-archive.example.com}"
MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-abcde123}" MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-abcde123}"
MYSQL_PILER_PASSWORD="${MYSQL_PILER_PASSWORD:-piler123}" MYSQL_PILER_PASSWORD="${MYSQL_PILER_PASSWORD:-piler123}"
SERVER_ID="${SERVER_ID:-0}" SERVER_ID="${SERVER_ID:-0}"
@ -157,7 +157,7 @@ fix_configs() {
fi fi
if [[ ! -f "$PILER_CONF" ]]; then if [[ ! -f "$PILER_CONF" ]]; then
sed -e "s/verystrongpassword/$MYSQL_PILER_PASSWORD/g" -e "s/piler.yourdomain.com/$PILER_HOSTNAME/g" /etc/piler/piler.conf.dist > "$PILER_CONF" sed -e "s/verystrongpassword/$MYSQL_PILER_PASSWORD/g" -e "s/piler.example.com/$PILER_HOSTNAME/g" /etc/piler/piler.conf.dist > "$PILER_CONF"
chmod 600 "$PILER_CONF" chmod 600 "$PILER_CONF"
chown $PILER_USER:$PILER_USER "$PILER_CONF" chown $PILER_USER:$PILER_USER "$PILER_CONF"
fi fi

View File

@ -43,7 +43,7 @@ services:
- MYSQL_USER=piler - MYSQL_USER=piler
- MYSQL_PASSWORD=piler123 - MYSQL_PASSWORD=piler123
- MYSQL_HOSTNAME=mysql - MYSQL_HOSTNAME=mysql
- PILER_HOSTNAME=archive.yourdomain.com - PILER_HOSTNAME=archive.example.com
- MEMCACHED_HOST=memcached - MEMCACHED_HOST=memcached
ports: ports:
- "25:25" - "25:25"

View File

@ -50,8 +50,8 @@ max_requests_per_child=10000
; SMTP HELO identification string ; SMTP HELO identification string
; this should be the FQDN part of the email address ; this should be the FQDN part of the email address
; where you copy emails, eg. archive@piler.yourdomain.com -> piler.yourdomain.com ; where you copy emails, eg. archive@piler.example.com -> piler.example.com
hostid=piler.yourdomain.com hostid=piler.example.com
; whether to process rcpt to addresses and add them to rcpt table (1) or not (0) ; whether to process rcpt to addresses and add them to rcpt table (1) or not (0)
process_rcpt_to_addresses=0 process_rcpt_to_addresses=0
@ -251,7 +251,7 @@ security_header=
; shouldn't be, then spammers may find it, and fill it with spam. ; shouldn't be, then spammers may find it, and fill it with spam.
; ;
; By setting this variable you may restrict the envelope address ; By setting this variable you may restrict the envelope address
; to a single email address, eg. some-random-address-12345@archive.yourdomain.com ; to a single email address, eg. some-random-address-12345@archive.example.com
; Then the archive will reject any other envelope recipients ; Then the archive will reject any other envelope recipients
archive_address= archive_address=

View File

@ -27,7 +27,7 @@ static void test_attachments(struct config *cfg){
TEST_HEADER(); TEST_HEADER();
snprintf(data.licence.hostname, TINYBUFSIZE-1, "yourdomain.com"); snprintf(data.licence.hostname, TINYBUFSIZE-1, "example.com");
for(i=0; i<sizeof(tests)/sizeof(struct attachments); i++){ for(i=0; i<sizeof(tests)/sizeof(struct attachments); i++){

View File

@ -10,7 +10,7 @@ encrypt_messages=1
extra_to_field=X-Envelope-To: extra_to_field=X-Envelope-To:
extract_attachments=1 extract_attachments=1
helper_timeout=20 helper_timeout=20
hostid=piler.yourdomain.com hostid=piler.example.com
iv= iv=
listen_addr=0.0.0.0 listen_addr=0.0.0.0
listen_port=25 listen_port=25

View File

@ -406,8 +406,8 @@ SOCKHELPER
cp webui/.htaccess "$DOCROOT" cp webui/.htaccess "$DOCROOT"
fi fi
if [[ -d /var/www/piler.yourdomain.com ]]; then if [[ -d /var/www/piler.example.com ]]; then
mv /var/www/piler.yourdomain.com "$DOCROOT" mv /var/www/piler.example.com "$DOCROOT"
fi fi