adjusting links & misc

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: "\U0001F41E Bug report"
 about: Create a report about a reproducible bug
 title: "[BUG]"
-labels: area/bug, meta/needs triage, priority/medium
+labels: kind/bug, meta/needs triage, priority/medium
 assignees: ""
 ---
 
@@ -13,21 +13,21 @@ Possible answers to your issue
   https://github.com/docker-mailserver/docker-mailserver#requirements
 
 * Email seen as spam:
-  https://github.com/tomav/docker-mailserver/wiki/Configure-SPF
-  https://github.com/tomav/docker-mailserver/wiki/Configure-DKIM
+  https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-SPF
+  https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-DKIM
 
 * Creating new domains and accounts
-  https://github.com/tomav/docker-mailserver/wiki/Configure-Accounts
+  https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-Accounts
 
 * Use a relay mail server
-  https://github.com/tomav/docker-mailserver/wiki/Configure-AWS-SES
+  https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-AWS-SES
   The variable name can be used for other email servers.
 
 * FAQ and tips
-  https://github.com/tomav/docker-mailserver/wiki/FAQ-and-Tips
+  https://github.com/docker-mailserver/docker-mailserver/wiki/FAQ-and-Tips
 
 * The wiki
-  https://github.com/tomav/docker-mailserver/wiki
+  https://github.com/docker-mailserver/docker-mailserver/wiki
 
 * Open issues
   https://github.com/docker-mailserver/docker-mailserver/issues

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: "\U0001F389 Feature request"
 about: Suggest an idea for this project
 title: '[FR]'
-labels: area/enhancement, kind/feature request, meta/needs triage, priority/low
+labels: area/enhancement, kind/feature (request), meta/needs triage, priority/low
 assignees: ''
 
 ---

.github/workflows/close_stale_issues.yml

@@ -12,10 +12,10 @@ jobs:
         uses: actions/stale@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 1 # TODO just for testing purposes, otherwise (20)
-          days-before-close: 1 # TODO just for testing purposes, otherwise (10)
+          days-before-stale: 20
+          days-before-close: 10
           stale-issue-label: "meta/stale"
-          close-issue-label: "meta/frozen due to age or inactivity"
+          close-issue-label: "meta/closed due to age or inactivity"
           stale-issue-message: >
             This issue has become stale because it has been open for 20 days without
             activity. Remove the label and comment or this issue will be closed in 10 days.

ENVIRONMENT.md

@@ -58,14 +58,14 @@ Otherwise, `iptables` won't be able to ban IPs.
   - self-signed => Enables self-signed certificates
   - _any other value_ => SSL required, settings by default
 
-Please read [the SSL page in the wiki](https://github.com/tomav/docker-mailserver/wiki/Configure-SSL) for more information.
+Please read [the SSL page in the wiki](https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-SSL) for more information.
 
 ##### TLS_LEVEL
 
 - **empty** => modern
 - modern => Enables TLSv1.2 and modern ciphers only. (default)
 - intermediate => Enables TLSv1, TLSv1.1 and TLSv1.2 and broad compatibility ciphers.
-- old => NOT implemented. If you really need it, then customize the TLS ciphers overriding postfix and dovecot settings [wiki](https://github.com/tomav/docker-mailserver/wiki/)
+- old => NOT implemented. If you really need it, then customize the TLS ciphers overriding postfix and dovecot settings [wiki](https://github.com/docker-mailserver/docker-mailserver/wiki/)
 
 ##### SPOOF_PROTECTION
 
@@ -132,7 +132,7 @@ Set the mailbox size limit for all users. If set to zero, the size will be unlim
 - **1** => Dovecot quota is enabled
 - 0 => Dovecot quota is disabled
 
-See [mailbox quota](https://github.com/tomav/docker-mailserver/wiki/Configure-Accounts#mailbox-quota).
+See [mailbox quota](https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-Accounts#mailbox-quota).
 
 ##### POSTFIX\_MESSAGE\_SIZE\_LIMIT
 

README.md

@@ -22,7 +22,7 @@ A fullstack but simple mail server (SMTP, IMAP, LDAP, Antispam, Antivirus, etc.)
 ## Included Services
 
 - [Postfix](http://www.postfix.org) with SMTP or LDAP auth
-- [Dovecot](https://www.dovecot.org) for SASL, IMAP (or POP3), with LDAP Auth, Sieve and [quotas](https://github.com/tomav/docker-mailserver/wiki/Configure-Accounts#mailbox-quota)
+- [Dovecot](https://www.dovecot.org) for SASL, IMAP (or POP3), with LDAP Auth, Sieve and [quotas](https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-Accounts#mailbox-quota)
 - [Amavis](https://www.amavis.org/)
 - [Spamassasin](http://spamassassin.apache.org/) supporting custom rules
 - [ClamAV](https://www.clamav.net/) with automatic updates
@@ -33,8 +33,8 @@ A fullstack but simple mail server (SMTP, IMAP, LDAP, Antispam, Antivirus, etc.)
 - [Postscreen](http://www.postfix.org/POSTSCREEN_README.html)
 - [Postgrey](https://postgrey.schweikert.ch/)
 - [LetsEncrypt](https://letsencrypt.org/) and self-signed certificates
-- [Setup script](https://github.com/tomav/docker-mailserver/wiki/Setup-docker-mailserver-using-the-script-setup.sh) to easily configure and maintain your mailserver
-- Basic [Sieve support](https://github.com/tomav/docker-mailserver/wiki/Configure-Sieve-filters) using dovecot
+- [Setup script](https://github.com/docker-mailserver/docker-mailserver/wiki/Setup-docker-mailserver-using-the-script-setup.sh) to easily configure and maintain your mailserver
+- Basic [Sieve support](https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-Sieve-filters) using dovecot
 - SASLauthd with LDAP auth
 - Persistent data and state
 - [CI/CD](https://github.com/docker-mailserver/docker-mailserver/actions)
@@ -42,7 +42,7 @@ A fullstack but simple mail server (SMTP, IMAP, LDAP, Antispam, Antivirus, etc.)
 
 ## Opening Issues and Contributing
 
-**Before opening an issue**, read this `README` carefully, use the [Wiki](https://github.com/tomav/docker-mailserver/wiki/), the Postfix/Dovecot documentation and your search engine you trust. The issue tracker is not meant to be used for unrelated questions! If you'd like to contribute, read [`CONTRIBUTING.md`](./CONTRIBUTING.md) thoroughly.
+**Before opening an issue**, read this `README` carefully, use the [Wiki](https://github.com/docker-mailserver/docker-mailserver/wiki/), the Postfix/Dovecot documentation and your search engine you trust. The issue tracker is not meant to be used for unrelated questions! If you'd like to contribute, read [`CONTRIBUTING.md`](./CONTRIBUTING.md) thoroughly.
 
 ## Requirements
 
@@ -57,7 +57,7 @@ A fullstack but simple mail server (SMTP, IMAP, LDAP, Antispam, Antivirus, etc.)
 - 1 vCore
 - 512MB RAM
 
-**Note:** You'll need to deactivate some services like ClamAV to be able to run on a host with 512MB of RAM. Even with 1G RAM you may run into problems without swap, see [FAQ](https://github.com/tomav/docker-mailserver/wiki/FAQ-and-Tips).
+**Note:** You'll need to deactivate some services like ClamAV to be able to run on a host with 512MB of RAM. Even with 1G RAM you may run into problems without swap, see [FAQ](https://github.com/docker-mailserver/docker-mailserver/wiki/FAQ-and-Tips).
 
 ## Usage
 
@@ -84,7 +84,7 @@ chmod a+x ./setup.sh
   - don't quote your values
   - variable substitution is *not* supported (e.g. `OVERRIDE_HOSTNAME=$HOSTNAME.$DOMAINNAME`).
 - Variables in `.env` are expanded in the `docker-compose.yml` file **only** and **not** in the container. The file `mailserver.env` serves this case where environment variables are used in the container.
-- If you want to use a bare domain (host name = domain name), see [FAQ](https://github.com/tomav/docker-mailserver/wiki/FAQ-and-Tips#can-i-use-nakedbare-domains-no-host-name)
+- If you want to use a bare domain (host name = domain name), see [FAQ](https://github.com/docker-mailserver/docker-mailserver/wiki/FAQ-and-Tips#can-i-use-nakedbare-domains-no-host-name)
 
 ### Get up and running
 
@@ -189,7 +189,7 @@ If you got any problems with SPF and/or forwarding mails, give [SRS](https://git
 2. Receives email and filters for spam and viruses. For submitting outgoing mail you should prefer the submission ports(465, 587), which require authentication. Unless a relay host is configured, outgoing email will leave the server via port 25(thus outbound traffic must not be blocked by your provider or firewall).
 3. A submission port since 2018, [RFC 8314](https://tools.ietf.org/html/rfc8314). Originally a secure variant of port 25.
 
-See the [wiki](https://github.com/tomav/docker-mailserver/wiki) for further details and best practice advice, especially regarding security concerns.
+See the [wiki](https://github.com/docker-mailserver/docker-mailserver/wiki) for further details and best practice advice, especially regarding security concerns.
 
 ## Examples
 

mailserver.env

@@ -21,7 +21,7 @@ POSTMASTER_ADDRESS=
 # Set different options for mynetworks option (can be overwrite in postfix-main.cf)
 # **WARNING**: Adding the docker network's gateway to the list of trusted hosts, e.g. using the `network` or
 # `connected-networks` option, can create an open relay
-# https://github.com/tomav/docker-mailserver/issues/1405#issuecomment-590106498
+# https://github.com/docker-mailserver/docker-mailserver/issues/1405#issuecomment-590106498
 # empty => localhost only
 # host => Add docker host (ipv4 only)
 # network => Add all docker containers (ipv4 only)
@@ -37,7 +37,7 @@ NETWORK_INTERFACE=
 # modern => Enables TLSv1.2 and modern ciphers only. (default)
 # intermediate => Enables TLSv1, TLSv1.1 and TLSv1.2 and broad compatibility ciphers.
 # old => NOT implemented. If you really need it, then customize the TLS ciphers overriding postfix and dovecot settings
-#        (https://github.com/tomav/docker-mailserver/wiki/)
+#        (https://github.com/docker-mailserver/docker-mailserver/wiki/)
 TLS_LEVEL=
 
 # Configures the handling of creating mails with forged sender addresses.
@@ -78,7 +78,7 @@ POSTSCREEN_ACTION=enforce
 # 1 => only launch postfix smtp
 SMTP_ONLY=
 
-# Please read [the SSL page in the wiki](https://github.com/tomav/docker-mailserver/wiki/Configure-SSL) for more information.
+# Please read [the SSL page in the wiki](https://github.com/docker-mailserver/docker-mailserver/wiki/Configure-SSL) for more information.
 #
 # empty => SSL disabled
 # letsencrypt => Enables Let's Encrypt certificates

target/scripts/start-mailserver.sh

@@ -806,6 +806,9 @@ function _setup_ldap
     _notify 'inf' "==> Warning: /etc/postfix/ldap-aliases.cf or /etc/postfix/ldap-groups.cf not found"
   fi
 
+  # shellcheck disable=SC2016
+  sed -i -E 's+mydestination = $myhostname, +mydestination = +' /etc/postfix/main.cf
+
   return 0
 }
 

test/mail_dhparams_default.bats

@@ -2,7 +2,7 @@ load 'test_helper/common'
 
 # Test case
 # ---------
-# By default, this image is using audited FFDHE groups (https://github.com/tomav/docker-mailserver/pull/1463)
+# By default, this image is using audited FFDHE groups (https://github.com/docker-mailserver/docker-mailserver/pull/1463)
 #
 # This test case covers the described case against both boolean states for `ONE_DIR`.
 #

test/mail_dhparams_manual_not_one_dir.bats

@@ -2,7 +2,7 @@ load 'test_helper/common'
 
 # Test case
 # ---------
-# By default, this image is using audited FFDHE groups (https://github.com/tomav/docker-mailserver/pull/1463)
+# By default, this image is using audited FFDHE groups (https://github.com/docker-mailserver/docker-mailserver/pull/1463)
 #
 # This test case covers the described case when `ONE_DIR=0`.
 #

test/mail_dhparams_manual_one_dir.bats

@@ -2,7 +2,7 @@ load 'test_helper/common'
 
 # Test case
 # ---------
-# By default, this image is using audited FFDHE groups (https://github.com/tomav/docker-mailserver/pull/1463)
+# By default, this image is using audited FFDHE groups (https://github.com/docker-mailserver/docker-mailserver/pull/1463)
 #
 # This test case covers the described case when `ONE_DIR=1`.
 #