Changing names of default CSV files.

diff --git a/.gitignore b/.gitignore
index d00cfa6ae0861c91956501a7e76e6cc1822244c2..531bb82f953bd7ad34708466188905540ea042e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ tmp/*
 venv/*
 etc/*.ini
 get-from-addr-totals.yaml
+get-from-addr-per-*.csv

diff --git a/lib/pp_admintools/app/get_from_addr.py b/lib/pp_admintools/app/get_from_addr.py
index eab96be1c358285167c5820ac129da35ddb1b752..254f1e3aa4df923883bf79c69e581f43f19a0c6c 100644 (file)
--- a/lib/pp_admintools/app/get_from_addr.py
+++ b/lib/pp_admintools/app/get_from_addr.py
@@ -49,8 +49,8 @@ class GetFromAddressesApp(BaseDPXApplication):
     default_limit = 10
 
     default_totals_yaml_file = Path('get-from-addr-totals.yaml')
-    default_stats_per_address_csv_file = Path('get-from-addr-per-address-{loghost}.csv')
-    default_stats_per_domain_csv_file = Path('get-from-addr-per-domain-{loghost}.csv')
+    default_stats_per_address_csv_file = Path('get-from-addr-per-address.csv')
+    default_stats_per_domain_csv_file = Path('get-from-addr-per-domain.csv')
 
     re_mail_domain = re.compile(r'.*@')
 
@@ -147,8 +147,7 @@ class GetFromAddressesApp(BaseDPXApplication):
             action=OutputFileOptionAction,
             help=_(
                 'The output CSV file about found FROM addresses for importing in a spread sheet '
-                'or into a database. The file name may have the tag {{loghost}}, which will be '
-                'substituted with the hostname of the mailserver. Default: {!r}').format(
+                'or into a database. Default: {!r}').format(
                 str(self.stats_per_address_csv_file))
         )
 
@@ -157,9 +156,8 @@ class GetFromAddressesApp(BaseDPXApplication):
             action=OutputFileOptionAction,
             help=_(
                 'The output CSV file about the domains of found FROM addresses for importing '
-                'in a spread sheet or into a database. The file name may have the tag '
-                '{{loghost}}, which will be substituted with the hostname of the mailserver. '
-                'Default: {!r}').format(str(self.stats_per_domain_csv_file))
+                'in a spread sheet or into a database. Default: {!r}').format(
+                str(self.stats_per_domain_csv_file))
         )
 
         logfiles_default = str(self.logdir / self.logfile_pattern)