diff options
| author | Barry Warsaw | 2011-04-08 22:05:33 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2011-04-08 22:05:33 -0400 |
| commit | 5de5904af6dd97339a70630002d64c901b008c98 (patch) | |
| tree | e9c01a2bd38587226745043b47106de1ac5efb84 /src/mailman/config | |
| parent | 0a58c7a9f2fe97665fba102eea9287b28575de5c (diff) | |
| parent | 25b407e24fe21dc46a4f9efa77734d55e0ed4bdd (diff) | |
| download | mailman-5de5904af6dd97339a70630002d64c901b008c98.tar.gz mailman-5de5904af6dd97339a70630002d64c901b008c98.tar.zst mailman-5de5904af6dd97339a70630002d64c901b008c98.zip | |
Merge passwords into rest
Diffstat (limited to 'src/mailman/config')
| -rw-r--r-- | src/mailman/config/config.py | 2 | ||||
| -rw-r--r-- | src/mailman/config/mailman.cfg | 2 | ||||
| -rw-r--r-- | src/mailman/config/schema.cfg | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py index 636b9ef9e..9c210b6a2 100644 --- a/src/mailman/config/config.py +++ b/src/mailman/config/config.py @@ -183,10 +183,8 @@ class Configuration: if category.template_dir == ':source:' else category.template_dir), # Files. - creator_pw_file = category.creator_pw_file, lock_file = category.lock_file, pid_file = category.pid_file, - site_pw_file = category.site_pw_file, ) # Now, perform substitutions recursively until there are no more # variables with $-vars in them, or until substitutions are not diff --git a/src/mailman/config/mailman.cfg b/src/mailman/config/mailman.cfg index f6811d7c9..d7bc0fded 100644 --- a/src/mailman/config/mailman.cfg +++ b/src/mailman/config/mailman.cfg @@ -38,8 +38,6 @@ lock_dir: /var/lock/mailman etc_dir: /etc ext_dir: /etc/mailman.d pid_file: /var/run/mailman/master-qrunner.pid -creator_pw_file: $data_dir/creator.pw -site_pw_file: $data_dir/adm.pw [language.en] diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg index f67b21637..030e5fc2c 100644 --- a/src/mailman/config/schema.cfg +++ b/src/mailman/config/schema.cfg @@ -115,10 +115,6 @@ template_dir: :source: # # This is where PID file for the master queue runner is stored. pid_file: $var_dir/master-qrunner.pid -# The site administrators password [obsolete]. -site_pw_file: $var_dir/adm.pw -# The site list creator's password [obsolete]. -creator_pw_file: $var_dir/creator.pw # Lock file. lock_file: $lock_dir/master-qrunner.lck @@ -140,6 +136,11 @@ testing: no [passwords] +# The default scheme to use to encrypt new passwords. Existing passwords +# include the scheme that was used to encrypt them, so it's okay to change +# this after users have been added. +password_scheme: ssha + # When Mailman generates them, this is the default length of passwords. password_length: 8 |