diff --git a/bundles/mailman/files/mailman-hyperkitty.cfg b/bundles/mailman/files/mailman-hyperkitty.cfg new file mode 100644 index 0000000..dee9cbb --- /dev/null +++ b/bundles/mailman/files/mailman-hyperkitty.cfg @@ -0,0 +1,22 @@ +# This is the mailman extension configuration file to enable HyperKitty as an +# archiver. Remember to add the following lines in the mailman.cfg file: +# +# [archiver.hyperkitty] +# class: mailman_hyperkitty.Archiver +# enable: yes +# configuration: /etc/mailman3/mailman-hyperkitty.cfg +# + +[general] + +# This is your HyperKitty installation, preferably on the localhost. This +# address will be used by Mailman to forward incoming emails to HyperKitty +# for archiving. It does not need to be publicly available, in fact it's +# better if it is not. +# However, if your Mailman installation is accessed via HTTPS, the URL needs +# to match your SSL certificate (e.g. https://lists.example.com/hyperkitty). +base_url: http://${hostname}/mailman3/hyperkitty/ + +# The shared api_key, must be identical except for quoting to the value of +# MAILMAN_ARCHIVER_KEY in HyperKitty's settings. +api_key: ${archiver_key} diff --git a/bundles/mailman/files/mailman-web.py b/bundles/mailman/files/mailman-web.py new file mode 100644 index 0000000..cae7697 --- /dev/null +++ b/bundles/mailman/files/mailman-web.py @@ -0,0 +1,188 @@ +# This file is imported by the Mailman Suite. It is used to override +# the default settings from /usr/share/mailman3-web/settings.py. + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '${secret_key}' + +ADMINS = ( + ('Mailman Suite Admin', 'root@localhost'), +) + +# Hosts/domain names that are valid for this site; required if DEBUG is False +# See https://docs.djangoproject.com/en/1.8/ref/settings/#allowed-hosts +# Set to '*' per default in the Deian package to allow all hostnames. Mailman3 +# is meant to run behind a webserver reverse proxy anyway. +ALLOWED_HOSTS = [ + '${hostname}', +] + +# Mailman API credentials +MAILMAN_REST_API_URL = 'http://localhost:8001' +MAILMAN_REST_API_USER = 'restadmin' +MAILMAN_REST_API_PASS = '${api_password}' +MAILMAN_ARCHIVER_KEY = '${archiver_key}' +MAILMAN_ARCHIVER_FROM = ('127.0.0.1', '::1') + +# Application definition + +INSTALLED_APPS = ( + 'hyperkitty', + 'postorius', + 'django_mailman3', + # Uncomment the next line to enable the admin: + 'django.contrib.admin', + # Uncomment the next line to enable admin documentation: + # 'django.contrib.admindocs', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'rest_framework', + 'django_gravatar', + 'compressor', + 'haystack', + 'django_extensions', + 'django_q', + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'django_mailman3.lib.auth.fedora', + #'allauth.socialaccount.providers.openid', + #'allauth.socialaccount.providers.github', + #'allauth.socialaccount.providers.gitlab', + #'allauth.socialaccount.providers.google', + #'allauth.socialaccount.providers.facebook', + #'allauth.socialaccount.providers.twitter', + #'allauth.socialaccount.providers.stackexchange', +) + + +# Database +# https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +DATABASES = { + 'default': { + # Use 'sqlite3', 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + #'ENGINE': 'django.db.backends.sqlite3', + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + #'ENGINE': 'django.db.backends.mysql', + # DB name or path to database file if using sqlite3. + #'NAME': '/var/lib/mailman3/web/mailman3web.db', + 'NAME': 'mailman', + # The following settings are not used with sqlite3: + 'USER': 'mailman', + 'PASSWORD': '${db_password}', + # HOST: empty for localhost through domain sockets or '127.0.0.1' for + # localhost through TCP. + 'HOST': '127.0.0.1', + # PORT: set to empty string for default. + 'PORT': '5432', + # OPTIONS: Extra parameters to use when connecting to the database. + 'OPTIONS': { + # Set sql_mode to 'STRICT_TRANS_TABLES' for MySQL. See + # https://docs.djangoproject.com/en/1.11/ref/ + # databases/#setting-sql-mode + #'init_command': "SET sql_mode='STRICT_TRANS_TABLES'", + }, + } +} + + +# If you're behind a proxy, use the X-Forwarded-Host header +# See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host +USE_X_FORWARDED_HOST = True + +# And if your proxy does your SSL encoding for you, set SECURE_PROXY_SSL_HEADER +# https://docs.djangoproject.com/en/1.8/ref/settings/#secure-proxy-ssl-header +# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https') + +# Other security settings +# SECURE_SSL_REDIRECT = True +# If you set SECURE_SSL_REDIRECT to True, make sure the SECURE_REDIRECT_EXEMPT +# contains at least this line: +# SECURE_REDIRECT_EXEMPT = [ +# "archives/api/mailman/.*", # Request from Mailman. +# ] +# SESSION_COOKIE_SECURE = True +# SECURE_CONTENT_TYPE_NOSNIFF = True +# SECURE_BROWSER_XSS_FILTER = True +# CSRF_COOKIE_SECURE = True +# CSRF_COOKIE_HTTPONLY = True +# X_FRAME_OPTIONS = 'DENY' + + +# Internationalization +# https://docs.djangoproject.com/en/1.8/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True +USE_L10N = True +USE_TZ = True + + +# Set default domain for email addresses. +EMAILNAME = 'localhost.local' + +# If you enable internal authentication, this is the address that the emails +# will appear to be coming from. Make sure you set a valid domain name, +# otherwise the emails may get rejected. +# https://docs.djangoproject.com/en/1.8/ref/settings/#default-from-email +# DEFAULT_FROM_EMAIL = "mailing-lists@you-domain.org" +DEFAULT_FROM_EMAIL = 'postorius@{}'.format(EMAILNAME) + +# If you enable email reporting for error messages, this is where those emails +# will appear to be coming from. Make sure you set a valid domain name, +# otherwise the emails may get rejected. +# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-SERVER_EMAIL +# SERVER_EMAIL = 'root@your-domain.org' +SERVER_EMAIL = 'root@{}'.format(EMAILNAME) + + +# Django Allauth +ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https" + + +# +# Social auth +# +SOCIALACCOUNT_PROVIDERS = { + #'openid': { + # 'SERVERS': [ + # dict(id='yahoo', + # name='Yahoo', + # openid_url='http://me.yahoo.com'), + # ], + #}, + #'google': { + # 'SCOPE': ['profile', 'email'], + # 'AUTH_PARAMS': {'access_type': 'online'}, + #}, + #'facebook': { + # 'METHOD': 'oauth2', + # 'SCOPE': ['email'], + # 'FIELDS': [ + # 'email', + # 'name', + # 'first_name', + # 'last_name', + # 'locale', + # 'timezone', + # ], + # 'VERSION': 'v2.4', + #}, +} + +# On a production setup, setting COMPRESS_OFFLINE to True will bring a +# significant performance improvement, as CSS files will not need to be +# recompiled on each requests. It means running an additional "compress" +# management command after each code upgrade. +# http://django-compressor.readthedocs.io/en/latest/usage/#offline-compression +COMPRESS_OFFLINE = True + +POSTORIUS_TEMPLATE_BASE_URL = 'http://${hostname}/mailman3/' diff --git a/bundles/mailman/files/mailman.cfg b/bundles/mailman/files/mailman.cfg new file mode 100644 index 0000000..f1266b7 --- /dev/null +++ b/bundles/mailman/files/mailman.cfg @@ -0,0 +1,271 @@ +# Copyright (C) 2008-2017 by the Free Software Foundation, Inc. +# +# This file is part of GNU Mailman. +# +# GNU Mailman is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# GNU Mailman. If not, see . + +# This file contains the Debian configuration for mailman. It uses ini-style +# formats under the lazr.config regime to define all system configuration +# options. See for details. + + +[mailman] +# This address is the "site owner" address. Certain messages which must be +# delivered to a human, but which can't be delivered to a list owner (e.g. a +# bounce from a list owner), will be sent to this address. It should point to +# a human. +site_owner: ${site_owner_email} + +# This is the local-part of an email address used in the From field whenever a +# message comes from some entity to which there is no natural reply recipient. +# Mailman will append '@' and the host name of the list involved. This +# address must not bounce and it must not point to a Mailman process. +noreply_address: noreply + +# The default language for this server. +default_language: de + +# Membership tests for posting purposes are usually performed by looking at a +# set of headers, passing the test if any of their values match a member of +# the list. Headers are checked in the order given in this variable. The +# value From_ means to use the envelope sender. Field names are case +# insensitive. This is a space separate list of headers. +sender_headers: from from_ reply-to sender + +# Mail command processor will ignore mail command lines after designated max. +email_commands_max_lines: 10 + +# Default length of time a pending request is live before it is evicted from +# the pending database. +pending_request_life: 3d + +# How long should files be saved before they are evicted from the cache? +cache_life: 7d + +# A callable to run with no arguments early in the initialization process. +# This runs before database initialization. +pre_hook: + +# A callable to run with no arguments late in the initialization process. +# This runs after adapters are initialized. +post_hook: + +# Which paths.* file system layout to use. +# You should not change this variable. +layout: debian + +# Can MIME filtered messages be preserved by list owners? +filtered_messages_are_preservable: no + +# How should text/html parts be converted to text/plain when the mailing list +# is set to convert HTML to plaintext? This names a command to be called, +# where the substitution variable $filename is filled in by Mailman, and +# contains the path to the temporary file that the command should read from. +# The command should print the converted text to stdout. +html_to_plain_text_command: /usr/bin/lynx -dump $filename + +# Specify what characters are allowed in list names. Characters outside of +# the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed, +# but this specifies a subset as the only allowable characters. This must be +# a valid character class regexp or the effect on list creation is +# unpredictable. +listname_chars: [-_.0-9a-z] + + +[shell] +# `mailman shell` (also `withlist`) gives you an interactive prompt that you +# can use to interact with an initialized and configured Mailman system. Use +# --help for more information. This section allows you to configure certain +# aspects of this interactive shell. + +# Customize the interpreter prompt. +prompt: >>> + +# Banner to show on startup. +banner: Welcome to the GNU Mailman shell + +# Use IPython as the shell, which must be found on the system. Valid values +# are `no`, `yes`, and `debug` where the latter is equivalent to `yes` except +# that any import errors will be displayed to stderr. +use_ipython: no + +# Set this to allow for command line history if readline is available. This +# can be as simple as $var_dir/history.py to put the file in the var directory. +history_file: + + +[paths.debian] +# Important directories for Mailman operation. These are defined here so that +# different layouts can be supported. For example, a developer layout would +# be different from a FHS layout. Most paths are based off the var_dir, and +# often just setting that will do the right thing for all the other paths. +# You might also have to set spool_dir though. +# +# Substitutions are allowed, but must be of the form $var where 'var' names a +# configuration variable in the paths.* section. Substitutions are expanded +# recursively until no more $-variables are present. Beware of infinite +# expansion loops! +# +# This is the root of the directory structure that Mailman will use to store +# its run-time data. +var_dir: /var/lib/mailman3 +# This is where the Mailman queue files directories will be created. +queue_dir: $var_dir/queue +# This is the directory containing the Mailman 'runner' and 'master' commands +# if set to the string '$argv', it will be taken as the directory containing +# the 'mailman' command. +bin_dir: /usr/lib/mailman3/bin +# All list-specific data. +list_data_dir: $var_dir/lists +# Directory where log files go. +log_dir: /var/log/mailman3 +# Directory for system-wide locks. +lock_dir: $var_dir/locks +# Directory for system-wide data. +data_dir: $var_dir/data +# Cache files. +cache_dir: $var_dir/cache +# Directory for configuration files and such. +etc_dir: /etc/mailman3 +# Directory containing Mailman plugins. +ext_dir: $var_dir/ext +# Directory where the default IMessageStore puts its messages. +messages_dir: $var_dir/messages +# Directory for archive backends to store their messages in. Archivers should +# create a subdirectory in here to store their files. +archive_dir: $var_dir/archives +# Root directory for site-specific template override files. +template_dir: $var_dir/templates +# There are also a number of paths to specific file locations that can be +# defined. For these, the directory containing the file must already exist, +# or be one of the directories created by Mailman as per above. +# +# This is where PID file for the master runner is stored. +pid_file: /run/mailman3/master.pid +# Lock file. +lock_file: $lock_dir/master.lck + + +[database] +# The class implementing the IDatabase. +class: mailman.database.sqlite.SQLiteDatabase +#class: mailman.database.mysql.MySQLDatabase +#class: mailman.database.postgresql.PostgreSQLDatabase + +# Use this to set the Storm database engine URL. You generally have one +# primary database connection for all of Mailman. List data and most rosters +# will store their data in this database, although external rosters may access +# other databases in their own way. This string supports standard +# 'configuration' substitutions. +url: sqlite:///$DATA_DIR/mailman.db +#url: mysql+pymysql://mailman3:mmpass@localhost/mailman3?charset=utf8&use_unicode=1 +#url: postgresql://mailman3:mmpass@localhost/mailman3 + +debug: no + + +[logging.debian] +# This defines various log settings. The options available are: +# +# - level -- Overrides the default level; this may be any of the +# standard Python logging levels, case insensitive. +# - format -- Overrides the default format string +# - datefmt -- Overrides the default date format string +# - path -- Overrides the default logger path. This may be a relative +# path name, in which case it is relative to Mailman's LOG_DIR, +# or it may be an absolute path name. You cannot change the +# handler class that will be used. +# - propagate -- Boolean specifying whether to propagate log message from this +# logger to the root "mailman" logger. You cannot override +# settings for the root logger. +# +# In this section, you can define defaults for all loggers, which will be +# prefixed by 'mailman.'. Use subsections to override settings for specific +# loggers. The names of the available loggers are: +# +# - archiver -- All archiver output +# - bounce -- All bounce processing logs go here +# - config -- Configuration issues +# - database -- Database logging (SQLAlchemy and Alembic) +# - debug -- Only used for development +# - error -- All exceptions go to this log +# - fromusenet -- Information related to the Usenet to Mailman gateway +# - http -- Internal wsgi-based web interface +# - locks -- Lock state changes +# - mischief -- Various types of hostile activity +# - runner -- Runner process start/stops +# - smtp -- Successful SMTP activity +# - smtp-failure -- Unsuccessful SMTP activity +# - subscribe -- Information about leaves/joins +# - vette -- Message vetting information +format: %(asctime)s (%(process)d) %(message)s +datefmt: %b %d %H:%M:%S %Y +propagate: no +level: info +path: mailman.log + +[webservice] +# The hostname at which admin web service resources are exposed. +hostname: ${hostname} + +# The port at which the admin web service resources are exposed. +port: 8001 + +# Whether or not requests to the web service are secured through SSL. +use_https: no + +# Whether or not to show tracebacks in an HTTP response for a request that +# raised an exception. +show_tracebacks: yes + +# The API version number for the current (highest) API. +api_version: 3.1 + +# The administrative username. +admin_user: restadmin + +# The administrative password. +admin_pass: ${api_password} + +[mta] +# The class defining the interface to the incoming mail transport agent. +#incoming: mailman.mta.exim4.LMTP +incoming: mailman.mta.postfix.LMTP + +# The callable implementing delivery to the outgoing mail transport agent. +# This must accept three arguments, the mailing list, the message, and the +# message metadata dictionary. +outgoing: mailman.mta.deliver.deliver + +# How to connect to the outgoing MTA. If smtp_user and smtp_pass is given, +# then Mailman will attempt to log into the MTA when making a new connection. +smtp_host: localhost +smtp_port: 25 +smtp_user: +smtp_pass: + +# Where the LMTP server listens for connections. Use 127.0.0.1 instead of +# localhost for Postfix integration, because Postfix only consults DNS +# (e.g. not /etc/hosts). +lmtp_host: 127.0.0.1 +lmtp_port: 8024 + +# Where can we find the mail server specific configuration file? The path can +# be either a file system path or a Python import path. If the value starts +# with python: then it is a Python import path, otherwise it is a file system +# path. File system paths must be absolute since no guarantees are made about +# the current working directory. Python paths should not include the trailing +# .cfg, which the file must end with. +#configuration: python:mailman.config.exim4 +configuration: python:mailman.config.postfix diff --git a/bundles/mailman/files/uwsgi.ini b/bundles/mailman/files/uwsgi.ini new file mode 100644 index 0000000..57e10ac --- /dev/null +++ b/bundles/mailman/files/uwsgi.ini @@ -0,0 +1,50 @@ +[uwsgi] +# Port on which uwsgi will be listening. +uwsgi-socket = /run/mailman3-web/uwsgi.sock + +#Enable threading for python +enable-threads = true + +# Move to the directory wher the django files are. +chdir = /usr/share/mailman3-web + +# Use the wsgi file provided with the django project. +wsgi-file = wsgi.py + +# Setup default number of processes and threads per process. +master = true +process = 2 +threads = 2 + +# Drop privielges and don't run as root. +uid = www-data +gid = www-data + +plugins = python3 + +# Setup the django_q related worker processes. +attach-daemon = python3 manage.py qcluster + +# Setup hyperkitty's cron jobs. +#unique-cron = -1 -1 -1 -1 -1 ./manage.py runjobs minutely +#unique-cron = -15 -1 -1 -1 -1 ./manage.py runjobs quarter_hourly +#unique-cron = 0 -1 -1 -1 -1 ./manage.py runjobs hourly +#unique-cron = 0 0 -1 -1 -1 ./manage.py runjobs daily +#unique-cron = 0 0 1 -1 -1 ./manage.py runjobs monthly +#unique-cron = 0 0 -1 -1 0 ./manage.py runjobs weekly +#unique-cron = 0 0 1 1 -1 ./manage.py runjobs yearly + +# Setup the request log. +#req-logger = file:/var/log/mailman3/web/mailman-web.log + +# Log cron seperately. +#logger = cron file:/var/log/mailman3/web/mailman-web-cron.log +#log-route = cron uwsgi-cron + +# Log qcluster commands seperately. +#logger = qcluster file:/var/log/mailman3/web/mailman-web-qcluster.log +#log-route = qcluster uwsgi-daemons + +# Last log and it logs the rest of the stuff. +#logger = file:/var/log/mailman3/web/mailman-web-error.log +logto = /var/log/mailman3/web/mailman-web.log diff --git a/bundles/mailman/items.py b/bundles/mailman/items.py index c539b9e..296b1e7 100644 --- a/bundles/mailman/items.py +++ b/bundles/mailman/items.py @@ -27,7 +27,62 @@ files = { 'triggers': { 'svc_systemd:postfix.service:restart', }, - } + }, + '/etc/mailman3/mailman.cfg': { + 'content_type': 'mako', + 'owner': 'root', + 'group': 'list', + 'mode': '0640', + 'context': node.metadata.get('mailman'), + 'needs': { + 'pkg_apt:mailman3-full', + }, + 'triggers': { + 'svc_systemd:mailman3.service:restart', + 'svc_systemd:mailman3-web.service:restart', + }, + }, + '/etc/mailman3/mailman-web.py': { + 'content_type': 'mako', + 'owner': 'root', + 'group': 'www-data', + 'mode': '0640', + 'context': node.metadata.get('mailman'), + 'needs': { + 'pkg_apt:mailman3-full', + }, + 'triggers': { + 'svc_systemd:mailman3.service:restart', + 'svc_systemd:mailman3-web.service:restart', + }, + }, + '/etc/mailman3/mailman-hyperkitty.cfg': { + 'content_type': 'mako', + 'owner': 'root', + 'group': 'list', + 'mode': '0640', + 'context': node.metadata.get('mailman'), + 'needs': { + 'pkg_apt:mailman3-full', + }, + 'triggers': { + 'svc_systemd:mailman3.service:restart', + 'svc_systemd:mailman3-web.service:restart', + }, + }, + '/etc/mailman3/uwsgi.ini': { + 'content_type': 'text', + 'owner': 'root', + 'group': 'root', + 'mode': '0644', + 'needs': { + 'pkg_apt:mailman3-full', + }, + 'triggers': { + 'svc_systemd:mailman3.service:restart', + 'svc_systemd:mailman3-web.service:restart', + }, + }, } svc_systemd = { diff --git a/bundles/mailman/metadata.py b/bundles/mailman/metadata.py index 1b2c57b..dda398a 100644 --- a/bundles/mailman/metadata.py +++ b/bundles/mailman/metadata.py @@ -1,8 +1,29 @@ +import base64 + +def derive_mailadmin_secret(metadata, salt): + node_id = metadata.get('id') + raw = base64.b64decode( + repo.vault.random_bytes_as_base64_for(f'{node_id}_{salt}', length=32).value + ) + return base64.urlsafe_b64encode(raw).rstrip(b'=').decode('ascii') + + defaults = { 'apt': { 'packages': { - 'mailman3-full': {}, + 'mailman3-full': { + 'needs': { + 'postgres_db:mailman', + 'postgres_role:mailman', + 'zfs_dataset:tank/mailman', + } + }, 'postfix': {}, + 'python3-psycopg2': { + 'needed_by': { + 'pkg_apt:mailman3-full', + }, + }, 'apache2': { 'installed': False, 'needs': { @@ -21,6 +42,33 @@ defaults = { } +@metadata_reactor.provides( + 'postgresql', + 'mailman', +) +def postgresql(metadata): + node_id = metadata.get('id') + db_password = repo.vault.password_for(f'{node_id} database mailman') + + return { + 'postgresql': { + 'databases': { + 'mailman': { + 'owner': 'mailman', + }, + }, + 'roles': { + 'mailman': { + 'password': db_password, + }, + }, + }, + 'mailman': { + 'db_password': db_password, + }, + } + + @metadata_reactor.provides( 'nginx/vhosts', ) @@ -34,3 +82,35 @@ def nginx(metadata): }, }, } + + +@metadata_reactor.provides( + 'mailman/secret_key', +) +def secret_key(metadata): + import base64 + + node_id = metadata.get('id') + raw = base64.b64decode( + repo.vault.random_bytes_as_base64_for(f'{node_id}_mailman_secret_key', length=32).value + ) + secret_key = base64.urlsafe_b64encode(raw).rstrip(b'=').decode('ascii') + + return { + 'mailman': { + 'secret_key': secret_key, + }, + } + + +@metadata_reactor.provides( + 'mailman', +) +def secrets(metadata): + return { + 'mailman': { + 'web_secret': derive_mailadmin_secret(metadata, 'secret_key'), + 'api_password': derive_mailadmin_secret(metadata, 'api_password'), + 'archiver_key': derive_mailadmin_secret(metadata, 'archiver_key'), + }, + } diff --git a/bundles/postgresql/files/pg_hba.conf b/bundles/postgresql/files/pg_hba.conf new file mode 100644 index 0000000..801cef7 --- /dev/null +++ b/bundles/postgresql/files/pg_hba.conf @@ -0,0 +1,22 @@ +# DO NOT DISABLE! +# If you change this first entry you will need to make sure that the +# database superuser can access the database using some other method. +# Noninteractive access to all databases is required during automatic +# maintenance (custom daily cronjobs, replication, and similar tasks). +# +# Database administrative login by Unix domain socket +local all postgres peer + +# TYPE DATABASE USER ADDRESS METHOD + +# "local" is for Unix domain socket connections only +local all all peer +# IPv4 local connections: +host all all 127.0.0.1/32 md5 +# IPv6 local connections: +host all all ::1/128 md5 +# Allow replication connections from localhost, by a user with the +# replication privilege. +local replication all peer +host replication all 127.0.0.1/32 md5 +host replication all ::1/128 md5 diff --git a/bundles/postgresql/items.py b/bundles/postgresql/items.py index b7e7ba8..21ae0cc 100644 --- a/bundles/postgresql/items.py +++ b/bundles/postgresql/items.py @@ -18,6 +18,20 @@ directories = { } files = { + f"/etc/postgresql/{version}/main/pg_hba.conf": { + 'mode': '0640', + 'owner': 'postgres', + 'group': 'postgres', + 'needs': [ + 'pkg_apt:postgresql', + ], + 'needed_by': [ + 'svc_systemd:postgresql.service', + ], + 'triggers': [ + 'svc_systemd:postgresql.service:restart', + ], + }, f"/etc/postgresql/{version}/main/conf.d/managed.conf": { 'content': '\n'.join( f'{key} = {value}' diff --git a/nodes/mseibert.mailman.py b/nodes/mseibert.mailman.py index 6ea4d44..b2a9b7d 100644 --- a/nodes/mseibert.mailman.py +++ b/nodes/mseibert.mailman.py @@ -15,6 +15,7 @@ 'mailman', 'wireguard', 'zfs', + 'postgresql', ], 'metadata': { 'id': '854cb39f-d964-4cc7-9051-ba6574708820', @@ -33,6 +34,7 @@ }, 'mailman': { 'hostname': 'mailman.ckn.li', + 'site_owner_email': 'martin.seibert@seibert.group', }, 'overwrite_nameservers': [ '8.8.8.8',