Merge pull request 'Clean-up' (#70) from 69-cleanup into master
Reviewed-on: Disroot/gpg-lacre#70
This commit is contained in:
commit
35987a6654
|
@ -52,7 +52,7 @@ def authenticate_maybe(smtp):
|
||||||
smtp.login(conf.get_item('smtp', 'username'), conf.get_item('smtp', 'password'))
|
smtp.login(conf.get_item('smtp', 'username'), conf.get_item('smtp', 'password'))
|
||||||
|
|
||||||
def send_msg( mailsubject, messagefile, recipients = None ):
|
def send_msg( mailsubject, messagefile, recipients = None ):
|
||||||
mailbody = load_file( conf.get_item('cron', 'mail_templates') + "/" + messagefile).read()
|
mailbody = load_file( conf.get_item('cron', 'mail_templates') + "/" + messagefile)
|
||||||
msg = MIMEMultipart("alternative")
|
msg = MIMEMultipart("alternative")
|
||||||
|
|
||||||
msg["From"] = conf.get_item('cron', 'notification_email')
|
msg["From"] = conf.get_item('cron', 'notification_email')
|
||||||
|
|
|
@ -46,6 +46,9 @@ dec_regex = None
|
||||||
[gpg]
|
[gpg]
|
||||||
# the directory where gpg-mailgate public keys are stored
|
# the directory where gpg-mailgate public keys are stored
|
||||||
# (see INSTALL for details)
|
# (see INSTALL for details)
|
||||||
|
#
|
||||||
|
# Note that this directory should be accessible only for the Lacre user,
|
||||||
|
# i.e. have mode 700.
|
||||||
keyhome = /var/gpgmailgate/.gnupg
|
keyhome = /var/gpgmailgate/.gnupg
|
||||||
|
|
||||||
[smime]
|
[smime]
|
||||||
|
@ -56,7 +59,9 @@ cert_path = /var/gpgmailgate/smime
|
||||||
# settings for the register-handler
|
# settings for the register-handler
|
||||||
register_email = register@yourdomain.tld
|
register_email = register@yourdomain.tld
|
||||||
mail_templates = /var/gpgmailgate/register_templates
|
mail_templates = /var/gpgmailgate/register_templates
|
||||||
# URL to webpanel. The server should be able to reach it
|
|
||||||
|
# URL to webpanel. Upon receiving an email with a key, register-handler
|
||||||
|
# uploads it to the web panel.
|
||||||
webpanel_url = http://yourdomain.tld
|
webpanel_url = http://yourdomain.tld
|
||||||
|
|
||||||
[cron]
|
[cron]
|
||||||
|
@ -93,17 +98,18 @@ port = 587
|
||||||
starttls = true
|
starttls = true
|
||||||
|
|
||||||
[database]
|
[database]
|
||||||
# uncomment the settings below if you want
|
# edit the settings below if you want to read keys from a
|
||||||
# to read keys from a gpg-mailgate-web database
|
# gpg-mailgate-web database other than SQLite
|
||||||
# TODO: see if this section is required by PHP. If not, delete it.
|
|
||||||
enabled = yes
|
enabled = yes
|
||||||
name = gpgmw
|
url = sqlite:///test.db
|
||||||
host = localhost
|
|
||||||
username = gpgmw
|
# For a MySQL database "gpgmw", user "gpgmw" and password "password",
|
||||||
password = password
|
# use the following URL:
|
||||||
|
#
|
||||||
|
#url = mysql://gpgmw:password@localhost/gpgmw
|
||||||
|
#
|
||||||
# For other RDBMS backends, see:
|
# For other RDBMS backends, see:
|
||||||
# https://docs.sqlalchemy.org/en/14/core/engines.html#database-urls
|
# https://docs.sqlalchemy.org/en/14/core/engines.html#database-urls
|
||||||
url = sqlite:///test.db
|
|
||||||
|
|
||||||
[enc_keymap]
|
[enc_keymap]
|
||||||
# You can find these by running the following command:
|
# You can find these by running the following command:
|
||||||
|
|
Loading…
Reference in a new issue