commit5c22600d98Merge:bc12ca7bcdbb4aAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Tue Nov 29 16:54:28 2022 +0100 Merge pull request #462 from Spitfireap/randomize-api-call-time randomize api call time commitbcdbb4a2ceAuthor: Spitap <dev@asdrip.fr> Date: Tue Nov 29 14:53:05 2022 +0100 fix typo commitbd1ddcef21Author: Spitap <dev@asdrip.fr> Date: Tue Nov 29 13:45:31 2022 +0100 randomize api call time commitbc12ca7327Merge:d364239bd0ecd0Author: Antoine Nguyen <tonio@ngyn.org> Date: Mon Nov 14 15:49:41 2022 +0100 Merge pull request #458 from Spitfireap/fix-include_try fix typo in dovecot configuration file commitbd0ecd0949Author: Spitap <dev@asdrip.fr> Date: Thu Nov 10 14:57:43 2022 +0100 fix typo in dovecot configuration file commitd364239348Merge:61838db3763300Author: Antoine Nguyen <tonio@ngyn.org> Date: Wed Nov 9 10:51:30 2022 +0100 Merge pull request #456 from modoboa/feature/improved_backup_restore WIP: Improved backup/restore system. commit37633008cbAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Wed Nov 9 10:30:44 2022 +0100 Fixed restore mode commitd6f9a5b913Author: Antoine Nguyen <tonio@ngyn.org> Date: Tue Nov 8 17:20:25 2022 +0100 Few fixes. commit8b1d60ee59Author: Antoine Nguyen <tonio@ngyn.org> Date: Tue Nov 8 17:19:23 2022 +0100 Few fixes commit2b5edae5d5Author: Antoine Nguyen <tonio@ngyn.org> Date: Sun Nov 6 10:30:24 2022 +0100 WIP: Improved backup/restore system. commit61838dbe4dAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Sat Nov 5 09:30:50 2022 +0100 Check if restore is defined before doing anything else. fix #453 commit962cac3ad9Merge:1b192c5ef2359aAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Fri Nov 4 09:41:20 2022 +0100 Merge pull request #450 from Spitfireap/fixed-super-call fixed super call in modoboa's script commitef2359a2a8Author: Spitap <dev@asdrip.fr> Date: Thu Nov 3 23:10:21 2022 +0100 fixed super call commit1b192c5fd5Merge:754d652b0b0146Author: Antoine Nguyen <tonio@ngyn.org> Date: Thu Nov 3 15:34:48 2022 +0100 Merge pull request #449 from Spitfireap/fixed-import-typo fixed constants import commitb0b01465d9Author: Spitap <dev@asdrip.fr> Date: Thu Nov 3 15:00:07 2022 +0100 fixed constants import commit754d652fc2Author: Antoine Nguyen <tonio@ngyn.org> Date: Thu Nov 3 12:27:04 2022 +0100 Few fixes commitcb5fa75693Merge:1afb8e6e01265aAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Thu Nov 3 12:20:25 2022 +0100 Merge pull request #444 from Spitfireap/tighter-config-file-perm tighter config file permission commit1afb8e61fcMerge:15c17798dd0b7dAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Thu Nov 3 12:17:16 2022 +0100 Merge pull request #424 from Spitfireap/restore Backup & restore system commit8dd0b7d497Author: Spitap <dev@asdrip.fr> Date: Thu Nov 3 10:57:03 2022 +0100 Last camelCase commit554611b366Author: Spitap <dev@asdrip.fr> Date: Thu Nov 3 10:54:06 2022 +0100 review fix commit15c17796f2Merge:ce8e7e684d1363Author: Antoine Nguyen <tonio@ngyn.org> Date: Fri Oct 28 09:43:30 2022 +0200 Merge pull request #446 from Spitfireap/fix-ssl-min-protocol fixed ssl_min_protocol setting commit84d13633a1Author: Spitap <dev@asdrip.fr> Date: Thu Oct 27 22:37:47 2022 +0200 fixed ssl_min_protocol setting commitce8e7e6027Merge:8e8ae5ffe7df27Author: Antoine Nguyen <tonio@ngyn.org> Date: Thu Oct 27 17:56:37 2022 +0200 Merge pull request #445 from Spitfireap/dovecot-fixes Fixes ssl permission error, updated ssl_protocol parameter commite01265a4eeMerge:a5fba03235ef3bAuthor: Spitap <dev@asdrip.fr> Date: Thu Oct 27 17:44:37 2022 +0200 Merge branch 'tighter-config-file-perm' of https://github.com/Spitfireap/modoboa-installer into tighter-config-file-perm commita5fba03264Author: Spitap <dev@asdrip.fr> Date: Thu Oct 27 11:13:47 2022 +0200 tighter config file permission commitfe7df276fcAuthor: Spitap <dev@asdrip.fr> Date: Thu Oct 27 17:25:39 2022 +0200 Check dovecot version greater commit8f34f0af6fAuthor: Spitap <dev@asdrip.fr> Date: Thu Oct 27 17:00:58 2022 +0200 Fixes ssl permission error, updated ssl_protocol parameter commit8e8ae5fb9cMerge:67f6ceefefbf54Author: Antoine Nguyen <tonio@ngyn.org> Date: Thu Oct 27 16:49:20 2022 +0200 Merge pull request #439 from stefaweb/master Update config_dict_template.py for default max_servers value commit235ef3befbAuthor: Spitap <dev@asdrip.fr> Date: Thu Oct 27 11:13:47 2022 +0200 thighter config file permission commit67f6cee8eaMerge:b84abbb53f7f8eAuthor: Antoine Nguyen <tonio@ngyn.org> Date: Tue Oct 25 19:32:37 2022 +0200 Merge pull request #442 from Spitfireap/patch-1 Set $max_server to 2 to avoid amavis crash commit5c9d5c9a03Author: Spitap <dev@asdrip.fr> Date: Tue Oct 25 16:58:57 2022 +0200 DKIM keys restore, Radicale backup/restore, fixes commit4c1f8710b5Author: Spitap <dev@asdrip.fr> Date: Tue Oct 25 16:04:55 2022 +0200 Added dkim key backup commite34eb4b337Author: Spitap <dev@asdrip.fr> Date: Tue Oct 25 13:59:28 2022 +0200 fix database path commit53f7f8ef9dAuthor: Spitfireap <45575529+Spitfireap@users.noreply.github.com> Date: Wed Oct 19 08:19:40 2022 +0000 Update config_dict_template.py commit35778cd614Merge:6726f5bb84abbbAuthor: Spitfireap <45575529+Spitfireap@users.noreply.github.com> Date: Tue Oct 18 17:17:48 2022 +0200 Merge branch 'modoboa:master' into restore commitfefbf549a4Author: Stephane Leclerc <sleclerc@actionweb.fr> Date: Thu Oct 6 13:36:13 2022 +0200 Update config_dict_template.py for default max_server value commit6726f5b1a2Author: Spitap <dev@asdrip.fr> Date: Mon Sep 26 13:39:28 2022 +0200 Improved path generation, path mistake proofing commita192cbcbd0Author: Spitap <dev@asdrip.fr> Date: Mon Sep 19 16:40:25 2022 +0200 Updated doc, default path on conf file commit5bed9655eaAuthor: Spitap <dev@asdrip.fr> Date: Mon Sep 19 15:53:19 2022 +0200 fixed typo commit6b096a7470Author: Spitap <dev@asdrip.fr> Date: Mon Sep 19 15:50:03 2022 +0200 Simplified db dumps restore commite30add03fdMerge:d75d83f1f8dd1bAuthor: Spitap <dev@asdrip.fr> Date: Mon Sep 19 15:39:05 2022 +0200 Update from master commitd75d83f202Author: Spitap <dev@asdrip.fr> Date: Mon Sep 19 15:13:44 2022 +0200 more refactoring commitf3811b4b39Author: Spitap <dev@asdrip.fr> Date: Mon Sep 19 14:59:43 2022 +0200 refactoring commitb0d56b3989Author: Spitap <dev@asdrip.fr> Date: Thu Sep 15 11:32:57 2022 +0200 PEP formating commit53e3e3ec58Author: Spitap <dev@asdrip.fr> Date: Fri Aug 5 15:20:11 2022 +0200 Better UX, use of os to concatenate path commite546d2cb23Author: Spitap <dev@asdrip.fr> Date: Wed Jul 27 16:32:59 2022 +0200 Better UX commit70faa1c5cbAuthor: Spitap <dev@asdrip.fr> Date: Wed Jul 27 15:58:41 2022 +0200 Fixed backupdir index commit563979a7ddAuthor: Spitap <dev@asdrip.fr> Date: Wed Jul 27 15:51:22 2022 +0200 fixed mail backup/restore commitee2ccf0647Author: Spitap <dev@asdrip.fr> Date: Wed Jul 27 14:35:48 2022 +0200 Fixed postfix install, added restore to readme commit2077c94b52Author: Spitap <dev@asdrip.fr> Date: Tue Jul 26 17:05:00 2022 +0200 Fix amavis config file not copied to right location commit4a7222bd24Author: Spitap <dev@asdrip.fr> Date: Tue Jul 26 16:53:24 2022 +0200 Fixed nginx call to uwsgi commite7b6104195Author: Spitap <dev@asdrip.fr> Date: Tue Jul 26 16:39:41 2022 +0200 fixed install within class commit4a00590354Author: Spitap <dev@asdrip.fr> Date: Tue Jul 26 16:20:03 2022 +0200 fixed restore disclamer commit15768c429eAuthor: Spitap <dev@asdrip.fr> Date: Tue Jul 26 12:07:42 2022 +0200 Restore workflow done commit439ffb94c4Author: Spitap <dev@asdrip.fr> Date: Mon Jul 25 18:54:47 2022 +0200 initial commit commit37bc21dfd3Author: Spitap <dev@asdrip.fr> Date: Tue Jul 26 10:36:08 2022 +0200 Backup postewhite.conf instead of custom whitelist Postwhite.conf contains a custom host list commit26204143afMerge:2097055d495afdAuthor: Spitap <dev@asdrip.fr> Date: Mon Jul 25 22:10:26 2022 +0200 Merge branch 'master' into backup commit20970557deAuthor: Spitap <dev@asdrip.fr> Date: Mon Jul 25 22:05:35 2022 +0200 Allow to disable mail backup commit632c26596eAuthor: Spitap <dev@asdrip.fr> Date: Mon Jul 25 21:52:15 2022 +0200 Update backup readme commit9e1c18cd6bAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 19:09:53 2022 +0200 Fix argument passed as list instead of string commitdb6457c5f5Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 19:07:18 2022 +0200 better path handling commit579faccfa5Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 19:00:32 2022 +0200 added an automatic bash option (no path provided) or a path provided bash (for cron job) commit5318fa279bAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 18:00:50 2022 +0200 bash option commit74de6a9bb1Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 17:31:56 2022 +0200 Reset pgpass before trying to backup secondary dbs commit54185a7c5aAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 17:26:40 2022 +0200 Fix database backup logic issue commit1f9d69c37cAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 17:21:59 2022 +0200 Fix copy issue commit8d02d2a9fbAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 17:09:23 2022 +0200 added safe mkdir in utils, use utils.mkdir_safe() in backup commit6f604a5fecAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 16:53:56 2022 +0200 Fix loop logic commit568c4a65a0Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 16:51:32 2022 +0200 fix none-type passed to os.path commitdc84a79528Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 14:12:35 2022 +0200 Note : capitalize affects only first letter commit304e25fa3cAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 14:10:57 2022 +0200 Fix getattr commit070efd61c4Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 14:08:39 2022 +0200 Fix import commit9917d8023eAuthor: Spitap <dev@asdrip.fr> Date: Thu Jul 21 14:02:41 2022 +0200 Edited README, fix backup run process commit27b9de6755Author: Spitap <dev@asdrip.fr> Date: Thu Jul 21 13:48:44 2022 +0200 database backup commit56ed214fb5Author: Spitap <dev@asdrip.fr> Date: Tue Jul 19 19:06:53 2022 +0200 Starting work on backup system
134 lines
4.7 KiB
Python
134 lines
4.7 KiB
Python
"""OpenDKIM related tools."""
|
|
|
|
import os
|
|
import pwd
|
|
import shutil
|
|
import stat
|
|
|
|
from .. import database
|
|
from .. import package
|
|
from .. import utils
|
|
|
|
from . import base
|
|
|
|
|
|
class Opendkim(base.Installer):
|
|
"""OpenDKIM installer."""
|
|
|
|
appname = "opendkim"
|
|
packages = {
|
|
"deb": ["opendkim"],
|
|
"rpm": ["opendkim"]
|
|
}
|
|
config_files = ["opendkim.conf", "opendkim.hosts"]
|
|
|
|
def get_packages(self):
|
|
"""Additional packages."""
|
|
packages = super(Opendkim, self).get_packages()
|
|
if package.backend.FORMAT == "deb":
|
|
packages += ["libopendbx1-{}".format(self.db_driver)]
|
|
else:
|
|
dbengine = "postgresql" if self.dbengine == "postgres" else "mysql"
|
|
packages += ["opendbx-{}".format(dbengine)]
|
|
return packages
|
|
|
|
def install_config_files(self):
|
|
"""Make sure config directory exists."""
|
|
user = self.config.get("opendkim", "user")
|
|
pw = pwd.getpwnam(user)
|
|
targets = [
|
|
[self.app_config["keys_storage_dir"], pw[2], pw[3]]
|
|
]
|
|
for target in targets:
|
|
if not os.path.exists(target[0]):
|
|
utils.mkdir(
|
|
target[0],
|
|
stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP |
|
|
stat.S_IROTH | stat.S_IXOTH,
|
|
target[1], target[2]
|
|
)
|
|
super().install_config_files()
|
|
|
|
def get_template_context(self):
|
|
"""Additional variables."""
|
|
context = super(Opendkim, self).get_template_context()
|
|
context.update({
|
|
"db_driver": self.db_driver,
|
|
"db_name": self.config.get("modoboa", "dbname"),
|
|
"db_user": self.app_config["dbuser"],
|
|
"db_password": self.app_config["dbpassword"],
|
|
"port": self.app_config["port"],
|
|
"user": self.app_config["user"]
|
|
})
|
|
return context
|
|
|
|
def setup_database(self):
|
|
"""Setup database."""
|
|
self.backend = database.get_backend(self.config)
|
|
self.backend.create_user(
|
|
self.app_config["dbuser"], self.app_config["dbpassword"]
|
|
)
|
|
dbname = self.config.get("modoboa", "dbname")
|
|
dbuser = self.config.get("modoboa", "dbuser")
|
|
dbpassword = self.config.get("modoboa", "dbpassword")
|
|
self.backend.load_sql_file(
|
|
dbname, dbuser, dbpassword,
|
|
self.get_file_path("dkim_view_{}.sql".format(self.dbengine))
|
|
)
|
|
self.backend.grant_right_on_table(
|
|
dbname, "dkim", self.app_config["dbuser"], "SELECT")
|
|
|
|
def post_run(self):
|
|
"""Additional tasks.
|
|
Check linux distribution (package deb, rpm), to adapt
|
|
to config file location and syntax.
|
|
- update opendkim isocket port config
|
|
- make sure opendkim starts after db service started
|
|
"""
|
|
if package.backend.FORMAT == "deb":
|
|
params_file = "/etc/default/opendkim"
|
|
else:
|
|
params_file = "/etc/opendkim.conf"
|
|
pattern = r"s/^(SOCKET=.*)/#\1/"
|
|
utils.exec_cmd(
|
|
"perl -pi -e '{}' {}".format(pattern, params_file))
|
|
with open(params_file, "a") as f:
|
|
f.write('\n'.join([
|
|
"",
|
|
'SOCKET="inet:12345@localhost"',
|
|
]))
|
|
|
|
# Make sure opendkim is started after postgresql and mysql,
|
|
# respectively.
|
|
if (self.dbengine != "postgres" and package.backend.FORMAT == "deb"):
|
|
dbservice = "mysql.service"
|
|
elif (self.dbengine != "postgres" and package.backend.FORMAT != "deb"):
|
|
dbservice = "mysqld.service"
|
|
else:
|
|
dbservice = "postgresql.service"
|
|
pattern = (
|
|
"s/^After=(.*)$/After=$1 {}/".format(dbservice))
|
|
utils.exec_cmd(
|
|
"perl -pi -e '{}' /lib/systemd/system/opendkim.service".format(pattern))
|
|
|
|
def restore(self):
|
|
"""Restore keys."""
|
|
dkim_keys_backup = os.path.join(
|
|
self.archive_path, "custom/dkim")
|
|
if os.path.isdir(dkim_keys_backup):
|
|
for file in os.listdir(dkim_keys_backup):
|
|
file_path = os.path.join(dkim_keys_backup, file)
|
|
if os.path.isfile(file_path):
|
|
utils.copy_file(file_path, self.config.get(
|
|
"opendkim", "keys_storage_dir", fallback="/var/lib/dkim"))
|
|
utils.success("DKIM keys restored from backup")
|
|
|
|
def custom_backup(self, path):
|
|
"""Backup DKIM keys."""
|
|
storage_dir = self.config.get(
|
|
"opendkim", "keys_storage_dir", fallback="/var/lib/dkim")
|
|
if os.path.isdir(storage_dir):
|
|
shutil.copytree(storage_dir, os.path.join(path, "dkim"))
|
|
utils.printcolor(
|
|
"DKIM keys saved!", utils.GREEN)
|