summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw2014-10-13 17:03:25 -0400
committerBarry Warsaw2014-10-13 17:03:25 -0400
commitdb5bb831fc2ab96aea515584429578c51f239b62 (patch)
treeab385a40915a1d5e8d70484e8aea36173e98dc35
parent8bc9e217f5c367794b05105bfc80fffac0e4b863 (diff)
downloadmailman-db5bb831fc2ab96aea515584429578c51f239b62.tar.gz
mailman-db5bb831fc2ab96aea515584429578c51f239b62.tar.zst
mailman-db5bb831fc2ab96aea515584429578c51f239b62.zip
-rw-r--r--src/mailman/commands/docs/conf.rst2
-rw-r--r--src/mailman/config/alembic.cfg20
-rw-r--r--src/mailman/config/schema.cfg5
-rw-r--r--src/mailman/database/alembic/__init__.py2
4 files changed, 22 insertions, 7 deletions
diff --git a/src/mailman/commands/docs/conf.rst b/src/mailman/commands/docs/conf.rst
index 3203271f9..2f708edc5 100644
--- a/src/mailman/commands/docs/conf.rst
+++ b/src/mailman/commands/docs/conf.rst
@@ -22,7 +22,7 @@ To get a list of all key-value pairs of any section, you need to call the
command without any options.
>>> command.process(FakeArgs)
- [alembic] script_location: mailman.database:alembic
+ [logging.archiver] path: mailman.log
...
[passwords] password_length: 8
...
diff --git a/src/mailman/config/alembic.cfg b/src/mailman/config/alembic.cfg
new file mode 100644
index 000000000..09fd03f58
--- /dev/null
+++ b/src/mailman/config/alembic.cfg
@@ -0,0 +1,20 @@
+# Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+
+[alembic]
+# Path to Alembic migration scripts.
+script_location: mailman.database:alembic
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index d28d2cf88..fa7624a81 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -643,8 +643,3 @@ rewrite_duplicate_headers:
CC X-Original-CC
Content-Transfer-Encoding X-Original-Content-Transfer-Encoding
MIME-Version X-MIME-Version
-
-
-[alembic]
-# Path to Alembic migration scripts.
-script_location: mailman.database:alembic
diff --git a/src/mailman/database/alembic/__init__.py b/src/mailman/database/alembic/__init__.py
index 9ac7f1311..ffd3af6df 100644
--- a/src/mailman/database/alembic/__init__.py
+++ b/src/mailman/database/alembic/__init__.py
@@ -29,4 +29,4 @@ from alembic.config import Config
from mailman.utilities.modules import expand_path
-alembic_cfg = Config(expand_path("python:mailman.config.schema"))
+alembic_cfg = Config(expand_path('python:mailman.config.alembic'))