From 295aeee83ef70e2304be3e67292a67f5051d6538 Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Wed, 22 Apr 2020 23:13:32 +0200 Subject: [PATCH] change default config location and release 1.0.1 --- README.md | 6 +++--- pymodmilter/run.py | 2 +- pymodmilter/version.py | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0059bfa..ebcc178 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A pymilter based sendmail/postfix pre-queue filter with the ability to add, remove and modify e-mail headers. The project is currently in beta status, but it is already used in a productive enterprise environment which processes about a million e-mails per month. -The basic idea is to define rules with conditions and do modifications when all conditions are met. +The basic idea is to define rules with conditions and modifications which are processed when all conditions are true. ## Dependencies Pymodmilter is depending on these python packages, but they are installed automatically if you are working with pip. @@ -13,9 +13,9 @@ Pymodmilter is depending on these python packages, but they are installed automa * Install pymodmilter with pip and copy the example configuration file. ```sh pip install pymodmilter -cp /usr/share/doc/pymodmilter/pymodmilter.conf.example /etc/pymodmilter.conf +cp /etc/pymodmilter/pymodmilter.conf.example /etc/pymodmilter/pymodmilter.conf ``` -* Modify /etc/pymodmilter.conf according to your needs. +* Modify /etc/pymodmilter/pymodmilter.conf according to your needs. ## Configuration options Pymodmilter uses a configuration file in JSON format. The options are described below. Make a copy of the [example configuration file](https://github.com/spacefreak86/pymodmilter/blob/master/docs/pymodmilter.conf.example) in the [docs](https://github.com/spacefreak86/pymodmilter/tree/master/docs) folder to start with. diff --git a/pymodmilter/run.py b/pymodmilter/run.py index 6e3c8e2..fe2faee 100644 --- a/pymodmilter/run.py +++ b/pymodmilter/run.py @@ -35,7 +35,7 @@ def main(): prog, max_help_position=45, width=140)) parser.add_argument( "-c", "--config", help="Config file to read.", - default="/etc/pymodmilter.conf") + default="/etc/pymodmilter/pymodmilter.conf") parser.add_argument( "-s", "--socket", diff --git a/pymodmilter/version.py b/pymodmilter/version.py index 5becc17..5c4105c 100644 --- a/pymodmilter/version.py +++ b/pymodmilter/version.py @@ -1 +1 @@ -__version__ = "1.0.0" +__version__ = "1.0.1" diff --git a/setup.py b/setup.py index 1459663..693433c 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ setup(name = "pymodmilter", }, data_files = [ ( - 'usr/share/doc/pymodmilter', + 'etc/pymodmilter', [ 'docs/pymodmilter.conf.example' ]