diff --git a/README.md b/README.md index d93bda3a..a1cb4379 100644 --- a/README.md +++ b/README.md @@ -405,9 +405,6 @@ DISABLE_ALIAS_SUFFIX=1 # the DKIM private key used to compute DKIM-Signature DKIM_PRIVATE_KEY_PATH=/dkim.key -# the DKIM public key used to setup custom domain DKIM -DKIM_PUBLIC_KEY_PATH=/dkim.pub.key - # DB Connection DB_URI=postgresql://myuser:mypassword@sl-db:5432/simplelogin diff --git a/app/config.py b/app/config.py index 7206917e..f63a04a9 100644 --- a/app/config.py +++ b/app/config.py @@ -148,20 +148,11 @@ DISABLE_ALIAS_SUFFIX = "DISABLE_ALIAS_SUFFIX" in os.environ UNSUBSCRIBER = os.environ.get("UNSUBSCRIBER") DKIM_PRIVATE_KEY_PATH = get_abs_path(os.environ["DKIM_PRIVATE_KEY_PATH"]) -DKIM_PUBLIC_KEY_PATH = get_abs_path(os.environ["DKIM_PUBLIC_KEY_PATH"]) DKIM_SELECTOR = b"dkim" with open(DKIM_PRIVATE_KEY_PATH) as f: DKIM_PRIVATE_KEY = f.read() -with open(DKIM_PUBLIC_KEY_PATH) as f: - DKIM_DNS_VALUE = ( - f.read() - .replace("-----BEGIN PUBLIC KEY-----", "") - .replace("-----END PUBLIC KEY-----", "") - .replace("\r", "") - .replace("\n", "") - ) DKIM_HEADERS = [b"from", b"to"] diff --git a/example.env b/example.env index 971313e2..b269b90f 100644 --- a/example.env +++ b/example.env @@ -72,10 +72,6 @@ EMAIL_SERVERS_WITH_PRIORITY=[(10, "email.hostname.")] # the DKIM private key used to compute DKIM-Signature DKIM_PRIVATE_KEY_PATH=local_data/dkim.key -# the DKIM public key used to setup custom domain DKIM -DKIM_PUBLIC_KEY_PATH=local_data/dkim.pub.key - - # delete and recreate the sqlite database, for local development RESET_DB=true diff --git a/tests/test.env b/tests/test.env index 4e29de24..f0f8191a 100644 --- a/tests/test.env +++ b/tests/test.env @@ -13,7 +13,6 @@ ADMIN_EMAIL=to_fill MAX_NB_EMAIL_FREE_PLAN=3 EMAIL_SERVERS_WITH_PRIORITY=[(10, "email.hostname.")] DKIM_PRIVATE_KEY_PATH=local_data/dkim.key -DKIM_PUBLIC_KEY_PATH=local_data/dkim.pub.key # Database RESET_DB=true