diff options
Diffstat (limited to 'modules')
41 files changed, 170 insertions, 170 deletions
diff --git a/modules/draklive/templates/sudoers.draklive b/modules/draklive/templates/sudoers.draklive index 536e4e9f..8d546396 100644 --- a/modules/draklive/templates/sudoers.draklive +++ b/modules/draklive/templates/sudoers.draklive @@ -1,3 +1,3 @@ <%= @login %> ALL=(root) NOPASSWD: /usr/sbin/draklive <%= @login %> ALL=(root) NOPASSWD: /usr/bin/draklive2 -%<%= isomakers_group %> ALL=(<%= @login %>) SETENV: NOPASSWD: ALL +%<%= @isomakers_group %> ALL=(<%= @login %>) SETENV: NOPASSWD: ALL diff --git a/modules/openldap/templates/slapd.conf b/modules/openldap/templates/slapd.conf index 542e54fa..a7d11214 100644 --- a/modules/openldap/templates/slapd.conf +++ b/modules/openldap/templates/slapd.conf @@ -126,7 +126,7 @@ constraint_attribute sshPublicKey regex "^ssh-(rsa|dss|ed25519) [[:graph:]]+ [[: #refint_attributes member #refint_nothing "uid=LDAP Admin,ou=System Accounts,dc=example,dc=com" -<% if environment == "test" %> +<% if @environment == "test" %> authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth" "cn=manager,<%= @dc_suffix %>" authz-regexp ^uid=([^,]+),cn=[^,]+,cn=auth$ uid=$1,ou=People,<%= @dc_suffix %> diff --git a/modules/planet/templates/backup_planet-files.sh b/modules/planet/templates/backup_planet-files.sh index 8cab8d1e..47916370 100755 --- a/modules/planet/templates/backup_planet-files.sh +++ b/modules/planet/templates/backup_planet-files.sh @@ -11,7 +11,7 @@ do then /bin/mkdir $PATH_TO_FILE/$locale fi - rsync -aHP --delete <%= location %>/$locale $PATH_TO_FILE/$locale/$locale-$COUNT + rsync -aHP --delete <%= @location %>/$locale $PATH_TO_FILE/$locale/$locale-$COUNT done # Check count file to have a week of backup in the directory if [ $COUNT -ne 6 ] diff --git a/modules/planet/templates/deploy_new-planet.sh b/modules/planet/templates/deploy_new-planet.sh index b3889d31..41557fcc 100755 --- a/modules/planet/templates/deploy_new-planet.sh +++ b/modules/planet/templates/deploy_new-planet.sh @@ -2,7 +2,7 @@ # Initialization PATH_TO_FILE=${PATH_TO_FILE:-/var/lib/planet} -PATH_TO_PLANET=${PATH_TO_PLANET:-<%= location %>} +PATH_TO_PLANET=${PATH_TO_PLANET:-<%= @location %>} #Ask for new locale name echo -n "Locale name: " @@ -33,7 +33,7 @@ then /bin/mkdir $FILE"cache" /bin/chown -R planet:apache $FILE /bin/chmod g+w $FILE"custom" $FILE"custom/people.opml" $FILE"admin/inc/pwd.inc.php" $FILE"cache" - echo -e "Info: a new Planet had been deployed.\nThe locale is: \"$locale\" - https://planet.<%= domain %>/$locale \n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -s "New planet Mageia deployed" mageia-webteam@<%= domain %> mageia-marketing@<%= domain %> + echo -e "Info: a new Planet had been deployed.\nThe locale is: \"$locale\" - https://planet.<%= @domain %>/$locale \n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -s "New planet Mageia deployed" mageia-webteam@<%= @domain %> mageia-marketing@<%= @domain %> fi else echo "Aborted, please try again." diff --git a/modules/planet/templates/planet_vhosts.conf b/modules/planet/templates/planet_vhosts.conf index b3a07ab9..652a69e7 100644 --- a/modules/planet/templates/planet_vhosts.conf +++ b/modules/planet/templates/planet_vhosts.conf @@ -1,4 +1,4 @@ -<Directory <%= location %> > +<Directory <%= @location %> > Order deny,allow Allow from All AllowOverride All diff --git a/modules/postfix/templates/group_aliases.conf b/modules/postfix/templates/group_aliases.conf index eac16dab..a4ad9e51 100644 --- a/modules/postfix/templates/group_aliases.conf +++ b/modules/postfix/templates/group_aliases.conf @@ -2,14 +2,14 @@ ldap = ldap_servers.map { |l| "ldaps://#{l}:636" } -%> server_host = <%= ldap.join(' ') %> -search_base = <%= dc_suffix %> +search_base = <%= @dc_suffix %> query_filter = (&(cn=mga-%u)(objectClass=groupOfNames)) result_attribute = mail special_result_attribute = member bind = yes -bind_dn = cn=postfix-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> -bind_pw = <%= ldap_password %> +bind_dn = cn=postfix-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %> +bind_pw = <%= @ldap_password %> # postfix complain on url # warning: dict_ldap_open: URL scheme ldaps requires protocol version 3 version = 3 -domain = group.<%= domain %> +domain = group.<%= @domain %> diff --git a/modules/postfix/templates/ldap_aliases.conf b/modules/postfix/templates/ldap_aliases.conf index 40d7da13..3bc50197 100644 --- a/modules/postfix/templates/ldap_aliases.conf +++ b/modules/postfix/templates/ldap_aliases.conf @@ -8,13 +8,13 @@ end ldap = ldap_servers.map { |l| "ldaps://#{l}:636" } -%> server_host = <%= ldap.join(' ') %> -search_base = <%= dc_suffix %> +search_base = <%= @dc_suffix %> query_filter = (&(uid=%u)(|<%= query_string %>)) result_attribute = mail bind = yes -bind_dn = cn=postfix-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> -bind_pw = <%= ldap_password %> +bind_dn = cn=postfix-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %> +bind_pw = <%= @ldap_password %> # postfix complain on url # warning: dict_ldap_open: URL scheme ldaps requires protocol version 3 version = 3 -domain = <%= domain %> +domain = <%= @domain %> diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index 6b42a4de..d3f6b50f 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -21,7 +21,7 @@ mailq_path = /usr/bin/mailq queue_directory = /var/spool/postfix mail_owner = postfix <% if all_tags.include?('postfix::simple_relay') || all_tags.include?('postfix::server::secondary') %> -relayhost = sucuk.<%= domain %> +relayhost = sucuk.<%= @domain %> <%- end -%> # User configurable parameters @@ -40,23 +40,23 @@ smtp_address_preference = ipv4 # FIXME Do not hardcode this mynetworks = 212.85.158.144/28 [2a02:2178:2:7::]/64 127.0.0.0/16 163.172.148.228 [2001:bc8:4400:2800::4115] -myhostname = <%= fqdn %> -mydomain = <%= domain %> +myhostname = <%= @fqdn %> +mydomain = <%= @domain %> <%- if all_tags.include?('postfix::server::secondary') -%> -relay_domains = <%= domain %>, - ml.<%= domain %>, - group.<%= domain %> +relay_domains = <%= @domain %>, + ml.<%= @domain %>, + group.<%= @domain %> <%- end -%> -mydestination = <%= fqdn %> +mydestination = <%= @fqdn %> <%- if all_tags.include?('postfix::server::primary') -%> - ml.<%= domain %> + ml.<%= @domain %> <%- end -%> <%- if all_tags.include?('postfix::server::primary') -%> -virtual_mailbox_domains = <%= domain %>, - group.<%= domain %> +virtual_mailbox_domains = <%= @domain %>, + group.<%= @domain %> # postfix complain if not set # Mar 22 23:51:20 alamut postfix/virtual[22952]: fatal: bad string length 0 < 1: virtual_mailbox_base = @@ -113,7 +113,7 @@ sympabounce_destination_recipient_limit = 1 <%- end -%> #delay_warning_time = 4h -smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (<%= lsbdistid %>) +smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (<%= @lsbdistid %>) unknown_local_recipient_reject_code = 450 smtp-filter_destination_concurrency_limit = 2 lmtp-filter_destination_concurrency_limit = 2 diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf index e0c116a7..331166c2 100644 --- a/modules/postfix/templates/simple_relay_main.cf +++ b/modules/postfix/templates/simple_relay_main.cf @@ -20,8 +20,8 @@ mail_owner = postfix # User configurable parameters -myhostname = <%= fqdn %> -mydomain = <%= domain %> +myhostname = <%= @fqdn %> +mydomain = <%= @domain %> inet_protocols = all mynetworks_style = host #delay_warning_time = 4h @@ -38,7 +38,7 @@ smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt local_recipient_maps = fallback_transport_maps = regexp:/etc/postfix/transport_regexp transport_maps = regexp:/etc/postfix/transport_regexp -mydestination = ml.<%= domain %> +mydestination = ml.<%= @domain %> sympa_destination_recipient_limit = 1 sympabounce_destination_recipient_limit = 1 virtual_alias_maps = regexp:/etc/postfix/sympa_aliases diff --git a/modules/postfix/templates/sympa_aliases b/modules/postfix/templates/sympa_aliases index 436e7a28..e2c4cdf4 100644 --- a/modules/postfix/templates/sympa_aliases +++ b/modules/postfix/templates/sympa_aliases @@ -1,8 +1,8 @@ # everything is handled with transports in postfix, # but according to https://www.sympa.org/faq/postfix, we also need this one <% escaped_domain = ( 'ml.' + domain ).sub('.','\.') %> -/^(.*)-owner\@<%= escaped_domain %>$/ $1+owner@ml.<%= domain %> +/^(.*)-owner\@<%= escaped_domain %>$/ $1+owner@ml.<%= @domain %> # redirect the mail from the ml domain to sysadmin -/^listmaster\@<%= escaped_domain %>$/ listmaster@<%= domain %> +/^listmaster\@<%= escaped_domain %>$/ listmaster@<%= @domain %> # errors are sent there, so that should also be redirected -/^sympa-request\@<%= escaped_domain %>$/ listmaster@<%= domain %> +/^sympa-request\@<%= escaped_domain %>$/ listmaster@<%= @domain %> diff --git a/modules/postfix/templates/virtual_aliases b/modules/postfix/templates/virtual_aliases index b2b1ce04..bca60907 100644 --- a/modules/postfix/templates/virtual_aliases +++ b/modules/postfix/templates/virtual_aliases @@ -1,37 +1,37 @@ # do not forget to add $domain or it will not work # do not hardcode the domain, or it will be harvested by bot -president@<%= domain %> jibz@<%= domain %> -secretary@<%= domain %> papoteur@<%= domain %> -tresorier@<%= domain %> maat@<%= domain %> +president@<%= @domain %> jibz@<%= @domain %> +secretary@<%= @domain %> papoteur@<%= @domain %> +tresorier@<%= @domain %> maat@<%= @domain %> -treasurer@<%= domain %> treasurer@group.<%= domain %> +treasurer@<%= @domain %> treasurer@group.<%= @domain %> -executive@<%= domain %> president@<%= domain %>, secretary@<%= domain %>, tresorier@<%= domain %> -admin@<%= domain %> maat@<%= domain %> +executive@<%= @domain %> president@<%= @domain %>, secretary@<%= @domain %>, tresorier@<%= @domain %> +admin@<%= @domain %> maat@<%= @domain %> -contact@<%= domain %> council@group.<%= domain %> -press@<%= domain %> council@group.<%= domain %> +contact@<%= @domain %> council@group.<%= @domain %> +press@<%= @domain %> council@group.<%= @domain %> # later switch to a team alias -root@<%= domain %> sysadmin@group.<%= domain %> +root@<%= @domain %> sysadmin@group.<%= @domain %> -security@<%= domain %> security@group.<%= domain %> +security@<%= @domain %> security@group.<%= @domain %> # Temporary(?) alias until there is a real board-commits@ list -board-commits@ml.<%= domain %> board-public@ml.<%= domain %> +board-commits@ml.<%= @domain %> board-public@ml.<%= @domain %> # TODO see https://www.ietf.org/rfc/rfc2142.txt <% ['postmaster','hostmaster','abuse','noc','listmaster','MAILER-DAEMON'].each { |a| %> -<%= a %>@<%= domain %> root@<%= domain %> +<%= a %>@<%= @domain %> root@<%= @domain %> <% } ['webmaster','www'].each { |a| %> -<%= a %>@<%= domain %> web@group.<%= domain %> +<%= a %>@<%= @domain %> web@group.<%= @domain %> <% } %> # TODO : diff --git a/modules/postgresql/templates/pg_hba.conf b/modules/postgresql/templates/pg_hba.conf index e4232a4e..379a1ee7 100644 --- a/modules/postgresql/templates/pg_hba.conf +++ b/modules/postgresql/templates/pg_hba.conf @@ -94,7 +94,7 @@ for i in db %> host <%= i %> <%= i %> 127.0.0.1/32 md5 host <%= i %> <%= i %> ::1/128 md5 -hostssl <%= i %> <%= i %> <%= ipaddress %>/32 md5 +hostssl <%= i %> <%= i %> <%= @ipaddress %>/32 md5 hostssl <%= i %> <%= i %> 2a02:2178:2:7::2/128 md5 <% end @@ -106,7 +106,7 @@ for l in lang %> host phpbb_<%= l %> phpbb 127.0.0.1/32 md5 host phpbb_<%= l %> phpbb ::1/128 md5 -hostssl phpbb_<%= l %> phpbb <%= ipaddress %>/32 md5 +hostssl phpbb_<%= l %> phpbb <%= @ipaddress %>/32 md5 hostssl phpbb_<%= l %> phpbb 2a02:2178:2:7::2/128 md5 # temporary, for the forum on friteuse vm hostssl phpbb_<%= l %> phpbb 192.168.122.0/24 md5 diff --git a/modules/postgrey/templates/whitelist_clients.local b/modules/postgrey/templates/whitelist_clients.local index 8c87b88c..a2118a54 100644 --- a/modules/postgrey/templates/whitelist_clients.local +++ b/modules/postgrey/templates/whitelist_clients.local @@ -1,2 +1,2 @@ # mageia -<%= domain %> +<%= @domain %> diff --git a/modules/puppet/templates/apache_proxy_vhost.conf b/modules/puppet/templates/apache_proxy_vhost.conf index 89157fc2..f0e4388c 100644 --- a/modules/puppet/templates/apache_proxy_vhost.conf +++ b/modules/puppet/templates/apache_proxy_vhost.conf @@ -9,15 +9,15 @@ ProxyRequests Off <VirtualHost *:8140> SSLEngine on - ServerName puppet.<%= domain %> + ServerName puppet.<%= @domain %> - ErrorLog /var/log/httpd/puppet_proxy.<%= domain %>.error.log - CustomLog /var/log/httpd/puppet_proxy.<%= domain %>.access.log + ErrorLog /var/log/httpd/puppet_proxy.<%= @domain %>.error.log + CustomLog /var/log/httpd/puppet_proxy.<%= @domain %>.access.log SSLCipherSuite SSLv2:-LOW:-EXPORT:RC4+RSA - SSLCertificateFile /var/lib/puppet/ssl/certs/puppet.<%= domain %>.pem - SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/puppet.<%= domain %>.pem + SSLCertificateFile /var/lib/puppet/ssl/certs/puppet.<%= @domain %>.pem + SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/puppet.<%= @domain %>.pem SSLCertificateChainFile /var/lib/puppet/ssl/ca/ca_crt.pem SSLCACertificateFile /var/lib/puppet/ssl/ca/ca_crt.pem diff --git a/modules/puppet/templates/config.ru b/modules/puppet/templates/config.ru index aba07857..b3fc037d 100644 --- a/modules/puppet/templates/config.ru +++ b/modules/puppet/templates/config.ru @@ -4,7 +4,7 @@ # if puppet is not in your RUBYLIB: # $:.unshift('/opt/puppet/lib') -$0 = '<%= service_name %>' +$0 = '<%= @service_name %>' # if you want debugging: # ARGV << "--debug" diff --git a/modules/puppet/templates/db_config.erb b/modules/puppet/templates/db_config.erb index 337a5043..1b906274 100644 --- a/modules/puppet/templates/db_config.erb +++ b/modules/puppet/templates/db_config.erb @@ -4,7 +4,7 @@ <%- else -%> dbadapter = postgresql dbuser = puppet - dbpassword = <%= pgsql_password %> - dbserver = pgsql.<%= domain %> + dbpassword = <%= @pgsql_password %> + dbserver = pgsql.<%= @domain %> dbname = puppet <%- end -%> diff --git a/modules/puppet/templates/puppet.agent.conf b/modules/puppet/templates/puppet.agent.conf index 44dfedb7..8379fd0a 100644 --- a/modules/puppet/templates/puppet.agent.conf +++ b/modules/puppet/templates/puppet.agent.conf @@ -1,5 +1,5 @@ [agent] - server = puppet.<%= domain %> + server = puppet.<%= @domain %> pluginsync = true @@ -11,8 +11,8 @@ report = true graph = true -<% if environment %> - environment = <%= environment %> +<% if @environment %> + environment = <%= @environment %> <% end %> # The file in which puppetd stores a list of the classes # associated with the retrieved configuration. Can be loaded in diff --git a/modules/puppet/templates/puppet.master.conf b/modules/puppet/templates/puppet.master.conf index 0180fc2a..b7ac38d1 100644 --- a/modules/puppet/templates/puppet.master.conf +++ b/modules/puppet/templates/puppet.master.conf @@ -1,11 +1,11 @@ <% db_config = scope.lookupvar('puppet::stored_config::db_config') %> [master] - certname = puppet.<%= domain %> + certname = puppet.<%= @domain %> # tagmail should be kept last, until this bug is fixed # https://projects.puppetlabs.com/issues/5018 reports = store,socket,tagmail - reportfrom = root@<%= domain %> + reportfrom = root@<%= @domain %> # Never remove this: # Store config is used to populate others configs diff --git a/modules/puppet/templates/tagmail.conf b/modules/puppet/templates/tagmail.conf index 96b034aa..bda12256 100644 --- a/modules/puppet/templates/tagmail.conf +++ b/modules/puppet/templates/tagmail.conf @@ -1 +1 @@ -err: sysadmin-reports@ml.<%= domain %> +err: sysadmin-reports@ml.<%= @domain %> diff --git a/modules/rsnapshot/templates/cron_file b/modules/rsnapshot/templates/cron_file index 43ca9e1b..39804cbf 100644 --- a/modules/rsnapshot/templates/cron_file +++ b/modules/rsnapshot/templates/cron_file @@ -1,5 +1,5 @@ #!/bin/sh <%- for conf in @rsnapshot_conf -%> -/usr/bin/rsnapshot -c <%= conf %> <%= rsnapshot_arg %> +/usr/bin/rsnapshot -c <%= conf %> <%= @rsnapshot_arg %> <%- end -%> diff --git a/modules/subversion/templates/hook_irker b/modules/subversion/templates/hook_irker index 8fd7a874..8f6ea431 100644 --- a/modules/subversion/templates/hook_irker +++ b/modules/subversion/templates/hook_irker @@ -1,4 +1,4 @@ #!/bin/sh REPO=$1 REV=$2 -<%= irkerhook_path %> --repository=$REPO $REV +<%= @irkerhook_path %> --repository=$REPO $REV diff --git a/modules/subversion/templates/hook_sendmail.pl b/modules/subversion/templates/hook_sendmail.pl index cf3be6a4..a5870c72 100644 --- a/modules/subversion/templates/hook_sendmail.pl +++ b/modules/subversion/templates/hook_sendmail.pl @@ -16,7 +16,7 @@ <%- commit_mail.each do |mail| -%> - <%= mail %> <%- end -%> -<%- if i18n_mail != '' -%> +<%- if @i18n_mail != '' -%> '.*\.pot$': PATH: "/usr/bin:/usr/local/bin" handler: Alternative @@ -28,5 +28,5 @@ revision-url: "https://svnweb.mageia.org/packages/?revision=%s&view=revision" subject_cx: 1 from: subversion_noreply@ml.<%= @domain %> - to: <%= i18n_mail %> + to: <%= @i18n_mail %> <%- end -%> diff --git a/modules/subversion/templates/restricted_to_user b/modules/subversion/templates/restricted_to_user index 98297627..fcdfa38c 100644 --- a/modules/subversion/templates/restricted_to_user +++ b/modules/subversion/templates/restricted_to_user @@ -5,8 +5,8 @@ TXN="$2" author=$(svnlook author -t "$TXN" "$REP") -if [ "$author" != '<%= restricted_to_user %>' ]; then - echo "this repository is restricted to user <%= restricted_to_user %>" >&2 +if [ "$author" != '<%= @restricted_to_user %>' ]; then + echo "this repository is restricted to user <%= @restricted_to_user %>" >&2 exit 1 fi diff --git a/modules/subversion/templates/syntax_check.sh b/modules/subversion/templates/syntax_check.sh index 3960cdab..76141e54 100644 --- a/modules/subversion/templates/syntax_check.sh +++ b/modules/subversion/templates/syntax_check.sh @@ -6,13 +6,13 @@ export PATH="/bin/:/sbin/:/usr/bin/:/usr/sbin/:/usr/local/bin:/usr/local/sbin/" changed=`svnlook changed -t "$TXN" "$REPOS"` files=`echo $changed | awk '{print $2}'` -if echo $files | grep "<%= regexp_ext %>" +if echo $files | grep "<%= @regexp_ext %>" then - svnlook cat -t "$TXN" "$REPOS" "$files" | <%= check_cmd %> + svnlook cat -t "$TXN" "$REPOS" "$files" | <%= @check_cmd %> if [ $? -ne 0 ] then echo "Syntax error in $files." 1>&2 - echo "Check it with <%= check_cmd %>" 1>&2 + echo "Check it with <%= @check_cmd %>" 1>&2 exit 1 fi fi diff --git a/modules/subversion/templates/xinetd b/modules/subversion/templates/xinetd index 0919ae60..c0eaab2a 100644 --- a/modules/subversion/templates/xinetd +++ b/modules/subversion/templates/xinetd @@ -9,6 +9,6 @@ service svnserve wait = no user = svn server = /usr/bin/svnserve - server_args = -i -r <%= svn_base_path %> + server_args = -i -r <%= @svn_base_path %> flags = IPv6 } diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf index 854fdf9c..9c433690 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 4262f3ca..40e4bc40 100644 --- a/modules/sympa/templates/config +++ b/modules/sympa/templates/config @@ -12,7 +12,7 @@ visibility noconceal digest 1,4 13:26 -<% if subscriber_ldap_group and not subscription_open %> +<% if @subscriber_ldap_group and not @subscription_open %> # TODO check scenari subscribe closed @@ -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,9 +34,9 @@ reception nomail source mga-ml_moderators visibility conceal -subject <%= subject %> +subject <%= @subject %> -custom_subject <%= custom_subject %> +custom_subject <%= @custom_subject %> <%- if @critical -%> info conceal @@ -48,12 +48,12 @@ unsubscribe auth_notify invite owner <% end %> -lang <%= language %> +lang <%= @language %> owner gecos Sysadmin team reception nomail -email postmaster@<%= domain %> +email postmaster@<%= @domain %> visibility noconceal profile normal @@ -67,20 +67,20 @@ reception nomail <%- if @reply_to -%> reply_to_header value other_email -other_email <%= reply_to %> +other_email <%= @reply_to %> apply forced <%- end -%> review owner -<% if topics %> -topics <%= topics %> +<% if @topics %> +topics <%= @topics %> <% end %> send restricted_<%= @name %> -<% if subscriber_ldap_group %> +<% if @subscriber_ldap_group %> include_ldap_query timeout 10 scope one @@ -91,10 +91,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 609a7e42..c8c5d9e4 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/search_filters/group.ldap b/modules/sympa/templates/search_filters/group.ldap index 884e0db1..2dadf3c2 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 edfaba15..e32fa88a 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 11aa7ae5..eb24736e 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 1a508199..a85f383a 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 diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index baf84118..333adea5 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -13,43 +13,43 @@ # You need to define at least the Xymon server itself here. page visible Visible Services -0.0.0.0 blog.<%= domain %> # sni https://blog.<%= domain %>/en/ -0.0.0.0 identity.<%= domain %> # https://identity.<%= domain %> -0.0.0.0 bugs.<%= domain %> # https://bugs.<%= domain %> -0.0.0.0 ml.<%= domain %> # https://ml.<%= domain %> -0.0.0.0 www.<%= domain %> # https://www.<%= domain %> -0.0.0.0 svnweb.<%= domain %> # https://svnweb.<%= domain %> -0.0.0.0 epoll.<%= domain %> # https://epoll.<%= domain %> -0.0.0.0 planet.<%= domain %> # sni https://planet.<%= domain %>/en/ +0.0.0.0 blog.<%= @domain %> # sni https://blog.<%= @domain %>/en/ +0.0.0.0 identity.<%= @domain %> # https://identity.<%= @domain %> +0.0.0.0 bugs.<%= @domain %> # https://bugs.<%= @domain %> +0.0.0.0 ml.<%= @domain %> # https://ml.<%= @domain %> +0.0.0.0 www.<%= @domain %> # https://www.<%= @domain %> +0.0.0.0 svnweb.<%= @domain %> # https://svnweb.<%= @domain %> +0.0.0.0 epoll.<%= @domain %> # https://epoll.<%= @domain %> +0.0.0.0 planet.<%= @domain %> # sni https://planet.<%= @domain %>/en/ # This checks the public reverse proxy -0.0.0.0 forums.<%= domain %> # sni https://forums.<%= domain %>=<%= @nodes_ipaddr['sucuk']['ipv4'] %>/ -0.0.0.0 check.<%= domain %> # https://check.<%= domain %> -0.0.0.0 madb.<%= domain %> # https://madb.mageia.org -0.0.0.0 pkgsubmit.<%= domain %> # sni https://pkgsubmit.<%= domain %> -#0.0.0.0 bcd.<%= domain %> # http://bcd.<%= domain %> -0.0.0.0 hugs.<%= domain %> # http://hugs.<%= domain %> -0.0.0.0 dashboard.<%= domain %> # http://dashboard.<%= domain %> -0.0.0.0 meetbot.<%= domain %> # sni https://meetbot.<%= domain %> +0.0.0.0 forums.<%= @domain %> # sni https://forums.<%= @domain %>=<%= @nodes_ipaddr['sucuk']['ipv4'] %>/ +0.0.0.0 check.<%= @domain %> # https://check.<%= @domain %> +0.0.0.0 madb.<%= @domain %> # https://madb.mageia.org +0.0.0.0 pkgsubmit.<%= @domain %> # sni https://pkgsubmit.<%= @domain %> +#0.0.0.0 bcd.<%= @domain %> # http://bcd.<%= @domain %> +0.0.0.0 hugs.<%= @domain %> # http://hugs.<%= @domain %> +0.0.0.0 dashboard.<%= @domain %> # http://dashboard.<%= @domain %> +0.0.0.0 meetbot.<%= @domain %> # sni https://meetbot.<%= @domain %> page servers Servers group-compress Marseille -212.85.158.151 sucuk.<%= domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %> http://xymon.<%= domain %> -212.85.158.148 ecosse.<%= domain %> # testip ssh -212.85.158.152 rabbit.<%= domain %> # testip ssh -212.85.158.153 duvel.<%= domain %> # testip ssh rsync svn git ldapssl ldap -212.85.158.154 garcimore.<%= domain %> # testip ssh -212.85.158.155 houdini.<%= domain %> # testip ssh -212.85.158.156 mandrake.<%= domain %> # testip ssh -212.85.158.157 webb.<%= domain %> # testip ssh -212.85.158.158 melies.<%= domain %> # testip ssh +212.85.158.151 sucuk.<%= @domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= @domain %> http://xymon.<%= @domain %> +212.85.158.148 ecosse.<%= @domain %> # testip ssh +212.85.158.152 rabbit.<%= @domain %> # testip ssh +212.85.158.153 duvel.<%= @domain %> # testip ssh rsync svn git ldapssl ldap +212.85.158.154 garcimore.<%= @domain %> # testip ssh +212.85.158.155 houdini.<%= @domain %> # testip ssh +212.85.158.156 mandrake.<%= @domain %> # testip ssh +212.85.158.157 webb.<%= @domain %> # testip ssh +212.85.158.158 melies.<%= @domain %> # testip ssh group-compress VM Sucuk -192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/ +192.168.122.131 friteuse.<%= @domain %> # testip ssh http://forums.<%= @domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/ group-compress Hetzner -49.13.82.246 lavand.<%= domain %> # testip -128.140.83.19 majax.<%= domain %> # testip +49.13.82.246 lavand.<%= @domain %> # testip +128.140.83.19 majax.<%= @domain %> # testip group-compress Scaleway 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp @@ -57,4 +57,4 @@ group-compress Scaleway # NOTE: lines with IPv6 addresses are ignored in xymon versions before 4.4 or 5.0 group-compress Oracle cloud -2603:c026:c101:f00::1:1 ociaa1.<%= domain %> # testip ssh +2603:c026:c101:f00::1:1 ociaa1.<%= @domain %> # testip ssh diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg index 763e253d..d40126d8 100644 --- a/modules/xymon/templates/hobbit-alerts.cfg +++ b/modules/xymon/templates/hobbit-alerts.cfg @@ -122,7 +122,7 @@ builder = ['ecosse','rabbit'] builders = builder.map{|x| x + "." + domain }.join(',') %> HOST=<%= builders %> SERVICE=cpu - MAIL=sysadmin-reports@ml.<%= domain %> DURATION>6h RECOVERED NOTICE REPEAT=3h STOP + MAIL=sysadmin-reports@ml.<%= @domain %> DURATION>6h RECOVERED NOTICE REPEAT=3h STOP -HOST=%.*.<%= domain %> - MAIL=sysadmin-reports@ml.<%= domain %> DURATION>5 RECOVERED NOTICE REPEAT=3h +HOST=%.*.<%= @domain %> + MAIL=sysadmin-reports@ml.<%= @domain %> DURATION>5 RECOVERED NOTICE REPEAT=3h diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg index ff010681..2acf94fe 100644 --- a/modules/xymon/templates/hobbit-clients.cfg +++ b/modules/xymon/templates/hobbit-clients.cfg @@ -346,19 +346,19 @@ # The special DEFAULT section can modify the built-in defaults - this must # be placed at the end of the file. -HOST=rabbit.<%= domain %> +HOST=rabbit.<%= @domain %> DISK %.*stage2$ IGNORE # ecosse has 24 cores, is a builder, and we try to use them all -HOST=ecosse.<%= domain %> +HOST=ecosse.<%= @domain %> LOAD 36.0 48.0 # rabbit has 12 cores and mksquashfs uses all of them -HOST=rabbit.<%= domain %> +HOST=rabbit.<%= @domain %> LOAD 18.0 24.0 # duvel has 24 cores, dont trigger alarms too soon -HOST=duvel.<%= domain %> +HOST=duvel.<%= @domain %> LOAD 18.0 24.0 DISK /var/lib/binrepo 95 98 DISK /var/www 95 98 diff --git a/modules/xymon/templates/hobbitserver.cfg b/modules/xymon/templates/hobbitserver.cfg index a5a7aacf..f2da8a6a 100644 --- a/modules/xymon/templates/hobbitserver.cfg +++ b/modules/xymon/templates/hobbitserver.cfg @@ -1,15 +1,15 @@ # NB : Even though it might look like a shell-script, it is NOT. # -BBSERVERROOT="<%= lib_dir %>/xymon" # Where Xymon is installed - holds the server and bbvar sub-dirs. +BBSERVERROOT="<%= @lib_dir %>/xymon" # Where Xymon is installed - holds the server and bbvar sub-dirs. BBSERVERLOGS="/var/log/xymon" # Directory for server logs. The hobbit user must have write-access here. -HOBBITCLIENTHOME="<%= lib_dir %>/xymon/client" # BBHOME directory for the client +HOBBITCLIENTHOME="<%= @lib_dir %>/xymon/client" # BBHOME directory for the client -BBSERVERHOSTNAME="sucuk.<%= domain %>" # The hostname of your server -BBSERVERIP="<%= ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 . +BBSERVERHOSTNAME="sucuk.<%= @domain %>" # The hostname of your server +BBSERVERIP="<%= @ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 . BBSERVEROS="linux" # The operating system of your server. linux,freebsd,solaris,hpux,aix,osf -BBSERVERWWWNAME="xymon.<%= domain %>" # The name used for this hosts' webserver +BBSERVERWWWNAME="xymon.<%= @domain %>" # The name used for this hosts' webserver BBSERVERWWWURL="/xymon" # The top URL for the Xymon webpages BBSERVERCGIURL="/xymon-cgi" # The URL for the Xymon CGI scripts. BBSERVERSECURECGIURL="/xymon-seccgi" # The URL for the secured Xymon CGI scripts. @@ -73,7 +73,7 @@ CGIBINURL="$BBSERVERCGIURL" # URL prefix for the Xymon CGI-scripts - /cgi-bin SECURECGIBINURL="$BBSERVERSECURECGIURL" # URL prefix for the secured Xymon CGI-scripts - /cgi-secure # Locations of system-wide files and directories -BBHOME="<%= lib_dir %>/xymon/server" # The Xymon server directory, where programs and configurations go. +BBHOME="<%= @lib_dir %>/xymon/server" # The Xymon server directory, where programs and configurations go. BBTMP="$BBHOME/tmp" # Directory used for temporary files. BBHOSTS="$BBHOME/etc/bb-hosts" # The bb-hosts file BB="$BBHOME/bin/bb" # The 'bb' client program @@ -99,7 +99,7 @@ BBHOSTHISTLOG="TRUE" # Save a log of all events for a host (not used by any t SAVESTATUSLOG="TRUE" # Save the detailed status log each time the status changes. # For the hobbitd_alert module -FROM="root@<%= domain %>" +FROM="root@<%= @domain %>" MAILC="mail -r $FROM" # Command used to send an e-mail with no subject MAIL="$MAILC -s" # Command used to send an e-mail with a subject SVCCODES="disk:100,cpu:200,procs:300,svcs:350,msgs:400,conn:500,http:600,dns:800,smtp:725,telnet:723,ftp:721,pop:810,pop3:810,pop-3:810,ssh:722,imap:843,ssh1:722,ssh2:722,imap2:843,imap3:843,imap4:843,pop2:809,pop-2:809,nntp:819,test:901" diff --git a/modules/xymon/templates/xymon-client b/modules/xymon/templates/xymon-client index e846d2a5..8413c8b8 100644 --- a/modules/xymon/templates/xymon-client +++ b/modules/xymon/templates/xymon-client @@ -9,7 +9,7 @@ # HOBBITSERVERS="192.168.1.1" # or (multiple servers) # HOBBITSERVERS="10.0.0.1 192.168.1.1" -XYMONSERVERS="<%= server %>" +XYMONSERVERS="<%= @server %>" # The defaults usually suffice for the rest of this file, # but you can tweak the hostname that the client reports diff --git a/modules/youri_check/templates/10.conf b/modules/youri_check/templates/10.conf index c37de91d..7c6e9860 100644 --- a/modules/youri_check/templates/10.conf +++ b/modules/youri_check/templates/10.conf @@ -10,15 +10,15 @@ resultset: class: Youri::Check::Resultset::DBI options: driver: Pg - host: <%= pgsql_server %>;sslmode=require - base: <%= pgsql_db %> - user: <%= pgsql_user %> - pass: <%= pgsql_password %> + host: <%= @pgsql_server %>;sslmode=require + base: <%= @pgsql_db %> + user: <%= @pgsql_user %> + pass: <%= @pgsql_password %> resolver: class: Youri::Check::Maintainer::Resolver::CGI options: - url: https://pkgsubmit.<%= domain %>/data/maintdb.txt + url: https://pkgsubmit.<%= @domain %>/data/maintdb.txt exceptions: - nobody @@ -36,7 +36,7 @@ reports: file: class: Youri::Check::Report::File options: - to: <%= outdir %> + to: <%= @outdir %> global: 1 individual: 1 formats: diff --git a/modules/youri_check/templates/9.conf b/modules/youri_check/templates/9.conf index 28028080..c2a97970 100644 --- a/modules/youri_check/templates/9.conf +++ b/modules/youri_check/templates/9.conf @@ -10,15 +10,15 @@ resultset: class: Youri::Check::Resultset::DBI options: driver: Pg - host: <%= pgsql_server %>;sslmode=require - base: <%= pgsql_db %> - user: <%= pgsql_user %> - pass: <%= pgsql_password %> + host: <%= @pgsql_server %>;sslmode=require + base: <%= @pgsql_db %> + user: <%= @pgsql_user %> + pass: <%= @pgsql_password %> resolver: class: Youri::Check::Maintainer::Resolver::CGI options: - url: https://pkgsubmit.<%= domain %>/data/maintdb.txt + url: https://pkgsubmit.<%= @domain %>/data/maintdb.txt exceptions: - nobody @@ -36,7 +36,7 @@ reports: file: class: Youri::Check::Report::File options: - to: <%= outdir %> + to: <%= @outdir %> global: 1 individual: 1 formats: diff --git a/modules/youri_check/templates/cauldron.conf b/modules/youri_check/templates/cauldron.conf index aeace447..5b600d45 100644 --- a/modules/youri_check/templates/cauldron.conf +++ b/modules/youri_check/templates/cauldron.conf @@ -12,15 +12,15 @@ resultset: class: Youri::Check::Resultset::DBI options: driver: Pg - host: <%= pgsql_server %>;sslmode=require - base: <%= pgsql_db %> - user: <%= pgsql_user %> - pass: <%= pgsql_password %> + host: <%= @pgsql_server %>;sslmode=require + base: <%= @pgsql_db %> + user: <%= @pgsql_user %> + pass: <%= @pgsql_password %> resolver: class: Youri::Check::Maintainer::Resolver::CGI options: - url: https://pkgsubmit.<%= domain %>/data/maintdb.txt + url: https://pkgsubmit.<%= @domain %>/data/maintdb.txt exceptions: - nobody @@ -319,7 +319,7 @@ tests: age: class: Youri::Check::Test::Age options: - max: <%= max_days %> days + max: <%= @max_days %> days pattern: "%d days" # reports definitions @@ -327,7 +327,7 @@ reports: file: class: Youri::Check::Report::File options: - to: <%= outdir %> + to: <%= @outdir %> global: 1 individual: 1 formats: diff --git a/modules/youri_check/templates/vhost_check.conf b/modules/youri_check/templates/vhost_check.conf index 2cf598b5..c3edca69 100644 --- a/modules/youri_check/templates/vhost_check.conf +++ b/modules/youri_check/templates/vhost_check.conf @@ -1,2 +1,2 @@ -Header set Access-Control-Allow-Origin "http://pkgsubmit.<%= domain %>" -Header set Access-Control-Allow-Origin "https://pkgsubmit.<%= domain %>" env=HTTPS +Header set Access-Control-Allow-Origin "http://pkgsubmit.<%= @domain %>" +Header set Access-Control-Allow-Origin "https://pkgsubmit.<%= @domain %>" env=HTTPS |