aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sympa/templates
diff options
context:
space:
mode:
Diffstat (limited to 'modules/sympa/templates')
-rw-r--r--modules/sympa/templates/auth.conf8
-rw-r--r--modules/sympa/templates/config22
-rw-r--r--modules/sympa/templates/data_sources/ldap_group.incl8
-rw-r--r--modules/sympa/templates/list.xml8
-rw-r--r--modules/sympa/templates/scenari/sender.restricted2
-rw-r--r--modules/sympa/templates/search_filters/group.ldap8
-rw-r--r--modules/sympa/templates/sympa.conf12
-rw-r--r--modules/sympa/templates/vhost_ml.conf2
-rw-r--r--modules/sympa/templates/webapp_sympa.conf2
9 files changed, 36 insertions, 36 deletions
diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf
index 9c433690..854fdf9c 100644
--- a/modules/sympa/templates/auth.conf
+++ b/modules/sympa/templates/auth.conf
@@ -1,7 +1,7 @@
ldap
- host ldap.<%= @domain %>
+ host ldap.<%= domain %>
timeout 30
- suffix <%= @dc_suffix %>
+ suffix <%= dc_suffix %>
get_dn_by_uid_filter (uid=[sender])
get_dn_by_email_filter (|(mail=[sender])(mailalternateaddress=[sender]))
email_attribute mail
@@ -9,7 +9,7 @@ ldap
use_tls ldaps
ssl_version tlsv1_2
ca_verify none
- bind_dn cn=sympa-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>
+ bind_dn cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>
bind_password <%= scope.lookupvar("sympa::server::ldap_password") %>
- authentication_info_url <%= @authentication_info_url %>
+ authentication_info_url <%= authentication_info_url %>
diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config
index bea0f057..ccf2fff9 100644
--- a/modules/sympa/templates/config
+++ b/modules/sympa/templates/config
@@ -24,7 +24,7 @@ unsubscribe open_web_only_notify
<% end %>
editor
-email listmaster@<%= @domain %>
+email listmaster@<%= domain %>
reception nomail
gecos Moderator team
visibility conceal
@@ -34,16 +34,16 @@ reception nomail
source mga-ml_moderators
visibility conceal
-subject <%= @subject %>
+subject <%= subject %>
-custom_subject <%= @custom_subject %>
+custom_subject <%= custom_subject %>
-lang <%= @language %>
+lang <%= language %>
owner
gecos Sysadmin team
reception nomail
-email postmaster@<%= @domain %>
+email postmaster@<%= domain %>
visibility noconceal
profile normal
@@ -57,7 +57,7 @@ reception nomail
<%- if @reply_to -%>
reply_to_header
value other_email
-other_email <%= @reply_to %>
+other_email <%= reply_to %>
apply forced
<%- end -%>
@@ -65,7 +65,7 @@ apply forced
review owner
<% if topics %>
-topics <%= @topics %>
+topics <%= topics %>
<% end %>
send restricted_<%= @name %>
@@ -81,10 +81,10 @@ include_ldap_query
attrs mail
ssl_ciphers ALL
passwd <%= scope.lookupvar("sympa::server::ldap_password") %>
- user cn=sympa-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>
- suffix ou=People,<%= @dc_suffix %>
- filter (memberOf=cn=<%= @subscriber_ldap_group %>,ou=Group,<%= @dc_suffix %>)
- host ldap.<%= @domain %>
+ user cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>
+ suffix ou=People,<%= dc_suffix %>
+ filter (memberOf=cn=<%= subscriber_ldap_group %>,ou=Group,<%= dc_suffix %>)
+ host ldap.<%= domain %>
<% end %>
diff --git a/modules/sympa/templates/data_sources/ldap_group.incl b/modules/sympa/templates/data_sources/ldap_group.incl
index c8c5d9e4..609a7e42 100644
--- a/modules/sympa/templates/data_sources/ldap_group.incl
+++ b/modules/sympa/templates/data_sources/ldap_group.incl
@@ -1,13 +1,13 @@
include_ldap_2level_query
- host ldap.<%= @domain %>
+ host ldap.<%= domain %>
use_tls ldaps
ssl_version tlsv1_2
ca_verify none
- user cn=sympa-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>
+ user cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>
passwd <%= scope.lookupvar("sympa::server::ldap_password") %>
- suffix1 ou=Group,<%= @dc_suffix %>
+ suffix1 ou=Group,<%= dc_suffix %>
scope1 one
- filter1 (&(objectClass=groupOfNames)(cn=<%= @name %>))
+ filter1 (&(objectClass=groupOfNames)(cn=<%= name %>))
attrs1 member
select1 all
suffix2 [attrs1]
diff --git a/modules/sympa/templates/list.xml b/modules/sympa/templates/list.xml
index b5e8b4c2..74e4f07f 100644
--- a/modules/sympa/templates/list.xml
+++ b/modules/sympa/templates/list.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" ?>
<list>
- <listname><%= @name %></listname>
+ <listname><%= name %></listname>
<type>discussion_list</type>
- <subject><%= @subject %></subject>
+ <subject><%= subject %></subject>
<description/>
<status>open</status>
- <language><%= @language %></language>
+ <language><%= language %></language>
<owner_include multiple="1">
<source>mga-sysadmin</source>
</owner_include>
<editor_include multiple="1">
<source>mga-ml_moderators</source>
</editor_include>
- <topic><%= @topics %></topic>
+ <topic><%= topics %></topic>
</list>
diff --git a/modules/sympa/templates/scenari/sender.restricted b/modules/sympa/templates/scenari/sender.restricted
index 7d23d208..66139e6c 100644
--- a/modules/sympa/templates/scenari/sender.restricted
+++ b/modules/sympa/templates/scenari/sender.restricted
@@ -5,7 +5,7 @@ search(<%= @ldap_group %>.ldap) smtp,md5,smime -> do_it
<%- end -%>
<%- if @email -%>
<%- for e in @email -%>
-equal([sender], '<%= @e %>') smtp,md5,smime -> do_it
+equal([sender], '<%= e %>') smtp,md5,smime -> do_it
<%- end -%>
<%- end -%>
<%- if allow_subscriber -%>
diff --git a/modules/sympa/templates/search_filters/group.ldap b/modules/sympa/templates/search_filters/group.ldap
index 2dadf3c2..884e0db1 100644
--- a/modules/sympa/templates/search_filters/group.ldap
+++ b/modules/sympa/templates/search_filters/group.ldap
@@ -1,9 +1,9 @@
-host ldap.<%= @domain %>:636
-bind_dn cn=sympa-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>
+host ldap.<%= domain %>:636
+bind_dn cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>
bind_password <%= scope.lookupvar("sympa::server::ldap_password") %>
use_tls ldaps
ssl_version tlsv1_2
ca_verify none
-suffix ou=People,<%= @dc_suffix %>
-filter (&(mail=[sender])(memberOf=cn=<%= @name %>,ou=Group,<%= @dc_suffix %>))
+suffix ou=People,<%= dc_suffix %>
+filter (&(mail=[sender])(memberOf=cn=<%= name %>,ou=Group,<%= dc_suffix %>))
scope sub
diff --git a/modules/sympa/templates/sympa.conf b/modules/sympa/templates/sympa.conf
index e32fa88a..edfaba15 100644
--- a/modules/sympa/templates/sympa.conf
+++ b/modules/sympa/templates/sympa.conf
@@ -1,14 +1,14 @@
###\\\\ Service description ////###
## Primary mail domain name
-domain <%= @vhost %>
+domain <%= vhost %>
## Email addresses of listmasters
## Email addresses of the listmasters (users authorized to perform global
## server commands). Some error reports may also be sent to these addresses.
## Listmasters can be defined for each virtual host, however, the default
## listmasters will have privileges to manage all virtual hosts.
-listmaster listmaster@<%= @vhost %>
+listmaster listmaster@<%= vhost %>
## Default language
## This is the default language used by Sympa. One of supported languages
@@ -47,7 +47,7 @@ db_type PostgreSQL
## Hostname of the database server
## With PostgreSQL, you can also use the path to Unix Socket Directory, e.g.
## "/var/run/postgresql" for connection with Unix domain socket.
-db_host pg.<%= @domain %>
+db_host pg.<%= domain %>
## Port of the database server
db_port 5432/tcp
@@ -455,7 +455,7 @@ umask 027
## URL prefix of web interface
## This is used to construct URLs of web interface.
-wwsympa_url https://<%= @vhost %>/l
+wwsympa_url https://<%= vhost %>/l
## URL prefix of WWSympa behind proxy
#http_host http://domain.tld
@@ -503,7 +503,7 @@ viewlogs_page_size 25
## Internet domain. Otherwise, for the specified host. The only reason for
## replacing the default value would be where WWSympa's authentication process
## is shared with an application running on another host.
-cookie_domain <%= @vhost %>
+cookie_domain <%= vhost %>
## HTTP cookies lifetime
## This is the default value when not set explicitly by users. "0" means the
@@ -573,7 +573,7 @@ dkim_add_signature_to robot,list
## The "d=" tag as defined in rfc 4871
## The DKIM "d=" tag, is the domain of the signing entity. Default is virtual
## host domain name
-dkim_signer_domain <%= @vhost %>
+dkim_signer_domain <%= vhost %>
## Rewrite header for DKIM signed messages and DMARC rejecting domains
dmarc_protection_mode dkim_signature,dmarc_reject
diff --git a/modules/sympa/templates/vhost_ml.conf b/modules/sympa/templates/vhost_ml.conf
index eb24736e..11aa7ae5 100644
--- a/modules/sympa/templates/vhost_ml.conf
+++ b/modules/sympa/templates/vhost_ml.conf
@@ -3,7 +3,7 @@
RewriteRule ^/l$ /l/
RewriteRule ^/l/(.*)$ /wwsympa-wrapper.fcgi/$1
- DocumentRoot <%= @lib_dir + "/sympa/cgi" %>
+ DocumentRoot <%= lib_dir + "/sympa/cgi" %>
Alias /static-sympa /var/lib/sympa/static_content
diff --git a/modules/sympa/templates/webapp_sympa.conf b/modules/sympa/templates/webapp_sympa.conf
index a85f383a..1a508199 100644
--- a/modules/sympa/templates/webapp_sympa.conf
+++ b/modules/sympa/templates/webapp_sympa.conf
@@ -1,4 +1,4 @@
-<Directory <%= @lib_dir + "/sympa/cgi" %> >
+<Directory <%= lib_dir + "/sympa/cgi" %> >
SetHandler fcgid-script
Options +ExecCGI
AddHandler cgi-script .fcgi
generated by cgit v1.2.1 (git 2.21.0) at 2024-12-04 19:21:00 +0000