Skip to content

Commit

Permalink
Refactor internals of config (1) (#924)
Browse files Browse the repository at this point in the history
* Merge @Sympa::ConfDef::params into %Sympa::ListDef::pinfo
* Merge %Conf::old_params into %Sympa::ListDef::pinfo
* Add aliases of parameter names for compatibility to sympa.conf/robot.conf of earlier versions.
* Move content of Sympa::ListDef to Sympa::Config::Schema
* Move content of Sympa::ConfDef to Sympa::Config::Schema
* Defining additional format entries in config schema.
* Merge sympa.conf(5) and list_config(5) into sympa_config(5).
  • Loading branch information
ikedas committed Jun 13, 2020
1 parent 680b0d4 commit 5b5fd55
Show file tree
Hide file tree
Showing 20 changed files with 6,553 additions and 5,874 deletions.
2 changes: 1 addition & 1 deletion default/web_tt2/list_menu.tt2
Expand Up @@ -260,7 +260,7 @@
[% CATCH %]
[% END %]

[% IF conf.show_report_abuse %]
[% IF conf.show_report_abuse == 'on' %]
<li>
[% PROCESS report_abuse.tt2 ~%]
</li>
Expand Down
2 changes: 1 addition & 1 deletion default/web_tt2/pref.tt2
Expand Up @@ -72,7 +72,7 @@
</form>
[% END %]

[% IF session.auth == 'classic' AND conf.allow_account_deletion %]
[% IF session.auth == 'classic' AND conf.allow_account_deletion == 'on' %]
<h4>[%|loc%]Deleting your account[%END%]</h4>
<p>
[%|loc%]Deleting your account will unsubscribe you from all your lists, remove your ownership of your lists and permanently delete your account.[%END%]
Expand Down
6 changes: 4 additions & 2 deletions doc/Makefile.am
Expand Up @@ -60,6 +60,7 @@ man5_MANS = \
list_config.5 \
nrcpt_by_domain.conf.5 \
sympa.conf.5 \
sympa_config.5 \
sympa_database.5 \
sympa.wsdl.5 \
sympa_scenario.5 \
Expand All @@ -73,9 +74,10 @@ EXTRA_DIST = $(nobase_doc_DATA) \
crawlers_detection.conf.pod \
edit_list.conf.pod \
ldap_alias_manager.conf.pod \
list_config.podpl \
list_config.pod \
nrcpt_by_domain.conf.pod \
sympa.conf.podpl \
sympa.conf.pod \
sympa_config.podpl \
sympa_database.podpl \
sympa_scenario.pod \
sympa_toc.pod \
Expand Down
12 changes: 12 additions & 0 deletions doc/list_config.pod
@@ -0,0 +1,12 @@

=encoding utf-8

=head1 NAME

list_config - Configuration file for mailing list

=head1 DESCRIPTION

See L<sympa_config(5)>.

=cut
12 changes: 12 additions & 0 deletions doc/sympa.conf.pod
@@ -0,0 +1,12 @@

=encoding utf-8

=head1 NAME

sympa.conf, robot.conf - Configuration file for default site and robot

=head1 DESCRIPTION

See L<sympa_config(5)>.

=cut
224 changes: 0 additions & 224 deletions doc/sympa.conf.podpl

This file was deleted.

0 comments on commit 5b5fd55

Please sign in to comment.