From c2b20a01eb311895dcf3a637676392c84dac8c9f Mon Sep 17 00:00:00 2001 From: Janos SUTO Date: Thu, 25 May 2023 19:00:51 +0200 Subject: [PATCH] Fixed #1295, replaced yourdomain.com with example.com Signed-off-by: Janos SUTO --- RELEASE_NOTES | 2 +- config.php.in | 20 ++++++++++---------- contrib/installer/focal.sh | 4 ++-- contrib/installer/jammy.sh | 4 ++-- docker/docker-compose.yaml | 2 +- etc/example.conf | 6 +++--- unit_tests/check_attachments.c | 2 +- unit_tests/test.conf | 2 +- util/postinstall.sh.in | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index b71dd37f..d310feff 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -60,7 +60,7 @@ Be sure to apply util/db-upgrade.sql - [BUGFIX] Refactored the smtp timeout check - 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: ------- diff --git a/config.php.in b/config.php.in index fdabe487..ab8867cd 100644 --- a/config.php.in +++ b/config.php.in @@ -42,8 +42,8 @@ $config['DEFAULT_LANG'] = 'en'; $config['THEME'] = 'default'; -$config['SITE_NAME'] = 'piler.yourdomain.com'; -$config['SITE_URL'] = 'http://piler.yourdomain.com/'; +$config['SITE_NAME'] = 'piler.example.com'; +$config['SITE_URL'] = 'http://piler.example.com/'; $config['EXTERNAL_DASHBOARD_URL'] = ''; @@ -83,7 +83,7 @@ $config['WKHTMLTOPDF_COMMAND'] = "wkhtmltopdf"; // authentication against an ldap directory (disabled by default) $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_PASSWORD'] = 'xxxxxxx'; $config['LDAP_MAIL_ATTR'] = 'mail'; @@ -114,9 +114,9 @@ $config['LDAP_MAIL_ATTR'] = 'proxyAddresses'; //$config['LDAP_MAIL_ATTR'] = 'mail'; // 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_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_ATTR'] = 'memberOfGroup'; //$config['LDAP_MAIL_ATTR'] = 'mail'; @@ -139,14 +139,14 @@ $config['ENABLE_IMAP_AUTH'] = 0; $config['RESTORE_OVER_IMAP'] = 0; $config['IMAP_RESTORE_FOLDER_INBOX'] = 'INBOX'; $config['IMAP_RESTORE_FOLDER_SENT'] = 'Sent'; -$config['IMAP_HOST'] = 'mail.yourdomain.com'; +$config['IMAP_HOST'] = 'mail.example.com'; $config['IMAP_PORT'] = 993; $config['IMAP_SSL'] = true; // enable authentication against a pop3 server (disabled by default) $config['ENABLE_POP3_AUTH'] = 0; -$config['POP3_HOST'] = 'mail.yourdomain.com'; +$config['POP3_HOST'] = 'mail.example.com'; $config['POP3_PORT'] = 995; $config['POP3_SSL'] = true; @@ -206,9 +206,9 @@ $config['SMARTHOST'] = ''; $config['SMARTHOST_PORT'] = 25; $config['SMARTHOST_USER'] = ''; $config['SMARTHOST_PASSWORD'] = ''; -$config['SMTP_DOMAIN'] = 'yourdomain.com'; -$config['SMTP_FROMADDR'] = 'no-reply@yourdomain.com'; -$config['ADMIN_EMAIL'] = 'admin@yourdomain.com'; +$config['SMTP_DOMAIN'] = 'example.com'; +$config['SMTP_FROMADDR'] = 'no-reply@example.com'; +$config['ADMIN_EMAIL'] = 'admin@example.com'; $config['PILER_HEADER_FIELD'] = 'X-piler-id: '; diff --git a/contrib/installer/focal.sh b/contrib/installer/focal.sh index 3ef2cc7e..b5077b62 100644 --- a/contrib/installer/focal.sh +++ b/contrib/installer/focal.sh @@ -6,7 +6,7 @@ set -o nounset set -x 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_PILER_PASSWORD="${MYSQL_PILER_PASSWORD:-piler123}" SERVER_ID="${SERVER_ID:-0}" @@ -148,7 +148,7 @@ fix_configs() { fi 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 chown $PILER_USER:$PILER_USER /etc/piler/piler.conf fi diff --git a/contrib/installer/jammy.sh b/contrib/installer/jammy.sh index 62802097..f75dba3c 100755 --- a/contrib/installer/jammy.sh +++ b/contrib/installer/jammy.sh @@ -6,7 +6,7 @@ set -o nounset set -x 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_PILER_PASSWORD="${MYSQL_PILER_PASSWORD:-piler123}" SERVER_ID="${SERVER_ID:-0}" @@ -157,7 +157,7 @@ fix_configs() { fi 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" chown $PILER_USER:$PILER_USER "$PILER_CONF" fi diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index d2b32a6e..0ff91680 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -43,7 +43,7 @@ services: - MYSQL_USER=piler - MYSQL_PASSWORD=piler123 - MYSQL_HOSTNAME=mysql - - PILER_HOSTNAME=archive.yourdomain.com + - PILER_HOSTNAME=archive.example.com - MEMCACHED_HOST=memcached ports: - "25:25" diff --git a/etc/example.conf b/etc/example.conf index 37e5eb74..823facc7 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -50,8 +50,8 @@ max_requests_per_child=10000 ; SMTP HELO identification string ; this should be the FQDN part of the email address -; where you copy emails, eg. archive@piler.yourdomain.com -> piler.yourdomain.com -hostid=piler.yourdomain.com +; where you copy emails, eg. archive@piler.example.com -> piler.example.com +hostid=piler.example.com ; whether to process rcpt to addresses and add them to rcpt table (1) or not (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. ; ; 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 archive_address= diff --git a/unit_tests/check_attachments.c b/unit_tests/check_attachments.c index e051ea40..2241d49a 100644 --- a/unit_tests/check_attachments.c +++ b/unit_tests/check_attachments.c @@ -27,7 +27,7 @@ static void test_attachments(struct config *cfg){ TEST_HEADER(); - snprintf(data.licence.hostname, TINYBUFSIZE-1, "yourdomain.com"); + snprintf(data.licence.hostname, TINYBUFSIZE-1, "example.com"); for(i=0; i