diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules')
118 files changed, 508 insertions, 508 deletions
diff --git a/modules/apache/templates/00_default_vhosts.conf b/modules/apache/templates/00_default_vhosts.conf index 74c92dd5..9a5f586c 100644 --- a/modules/apache/templates/00_default_vhosts.conf +++ b/modules/apache/templates/00_default_vhosts.conf @@ -10,6 +10,6 @@ Redirect 404 / ErrorDocument 404 "Page Not Found" <%- else -%> - Redirect / <%= @default_redirect %> + Redirect / <%= default_redirect %> <%- end -%> </VirtualHost> diff --git a/modules/apache/templates/01_default_ssl_vhost.conf b/modules/apache/templates/01_default_ssl_vhost.conf index 16c048a6..c9cdcfcd 100644 --- a/modules/apache/templates/01_default_ssl_vhost.conf +++ b/modules/apache/templates/01_default_ssl_vhost.conf @@ -15,7 +15,7 @@ # General setup for the virtual host DocumentRoot "/var/www/html" #ServerName localhost:443 -ServerAdmin root@<%= @domain %> +ServerAdmin root@<%= domain %> ErrorLog logs/ssl_error_log <IfModule mod_log_config.c> @@ -39,9 +39,9 @@ SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:EC SSLProtocol ALL -SSLv2 -SSLv3 <%- if wildcard_sslcert == 'true' then -%> -SSLCertificateFile /etc/ssl/wildcard.<%= @domain %>.crt -SSLCertificateKeyFile /etc/ssl/wildcard.<%= @domain %>.key -SSLCACertificateFile /etc/ssl/wildcard.<%= @domain %>.pem +SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt +SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key +SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem SSLVerifyClient None <%- else -%> SSLCertificateFile /etc/ssl/apache/localhost.pem diff --git a/modules/apache/templates/django.wsgi b/modules/apache/templates/django.wsgi index f48dae04..aa0b82c8 100644 --- a/modules/apache/templates/django.wsgi +++ b/modules/apache/templates/django.wsgi @@ -1,13 +1,13 @@ #!/usr/bin/python import os, sys <%- for m in module_path -%> -path = '<%= @m %>' +path = '<%= m %>' if path not in sys.path: sys.path.append(path) <%- end -%> <%- if django_module -%> -os.environ['DJANGO_SETTINGS_MODULE'] = '<%= @django_module %>.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = '<%= django_module %>.settings' <%- else -%> os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' <%- end -%> diff --git a/modules/apache/templates/mod/php.conf b/modules/apache/templates/mod/php.conf index 8bc20078..6d64ffb8 100644 --- a/modules/apache/templates/mod/php.conf +++ b/modules/apache/templates/mod/php.conf @@ -1,5 +1,5 @@ # as php insist to have this value set, let's # look on the system for him -php_value date.timezone "<%= @php_date_timezone %>" -php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f root@<%= @domain %>" +php_value date.timezone "<%= php_date_timezone %>" +php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f root@<%= domain %>" diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf index c49b36f5..84c8f918 100644 --- a/modules/apache/templates/vhost_base.conf +++ b/modules/apache/templates/vhost_base.conf @@ -5,18 +5,18 @@ else end -%> -<VirtualHost *:<%= @port %>> +<VirtualHost *:<%= port %>> <%- if use_ssl then -%> <%= scope.function_template(["apache/vhost_ssl.conf"]) %> <%- end -%> - ServerName <%= @real_vhost %> + ServerName <%= real_vhost %> <%- server_aliases.each do |key| -%> - ServerAlias <%= @key %> + ServerAlias <%= key %> <%- end -%> - DocumentRoot <%= @location %> + DocumentRoot <%= location %> - CustomLog <%= @real_access_logfile %> combined - ErrorLog <%= @real_error_logfile %> + CustomLog <%= real_access_logfile %> combined + ErrorLog <%= real_error_logfile %> <%- if enable_public_html -%> #TODO add the rest @@ -28,14 +28,14 @@ end <%- end -%> <%- aliases.keys.sort {|a,b| a.size <=> b.size }.reverse.each do |key| -%> - Alias <%= @key %> <%= @aliases[key] %> + Alias <%= key %> <%= aliases[key] %> <%- end -%> - <%= @content %> + <%= content %> <%- if options.length > 0 -%> - <Directory <%= @location %>> - Options <%= @options.join(" ") %> + <Directory <%= location %>> + Options <%= options.join(" ") %> </Directory> <%- end -%> diff --git a/modules/apache/templates/vhost_django_app.conf b/modules/apache/templates/vhost_django_app.conf index d85cf7a9..3310045e 100644 --- a/modules/apache/templates/vhost_django_app.conf +++ b/modules/apache/templates/vhost_django_app.conf @@ -1 +1 @@ -WSGIScriptAlias / /usr/local/lib/wsgi/<%= @name %>.wsgi +WSGIScriptAlias / /usr/local/lib/wsgi/<%= name %>.wsgi diff --git a/modules/apache/templates/vhost_fcgid.conf b/modules/apache/templates/vhost_fcgid.conf index 007ab969..288b5aa2 100644 --- a/modules/apache/templates/vhost_fcgid.conf +++ b/modules/apache/templates/vhost_fcgid.conf @@ -1,8 +1,8 @@ AddHandler fcgid-script .pl <%- script_aliases.keys.sort {|a,b| a.size <=> b.size }.reverse.each do |key| -%> - ScriptAlias <%= @key %> <%= @script_aliases[key] %> + ScriptAlias <%= key %> <%= script_aliases[key] %> <%- end -%> -FcgidMinProcessesPerClass <%= @process %> +FcgidMinProcessesPerClass <%= process %> FcgidIdleTimeout 30 # These robots were scraping the whole of svnweb in 2024-04, causing severe diff --git a/modules/apache/templates/vhost_redirect.conf b/modules/apache/templates/vhost_redirect.conf index c787311e..0f256881 100644 --- a/modules/apache/templates/vhost_redirect.conf +++ b/modules/apache/templates/vhost_redirect.conf @@ -1,2 +1,2 @@ -Redirect / <%= @url %> +Redirect / <%= url %> diff --git a/modules/apache/templates/vhost_reverse_proxy.conf b/modules/apache/templates/vhost_reverse_proxy.conf index 1aabda4f..1488c682 100644 --- a/modules/apache/templates/vhost_reverse_proxy.conf +++ b/modules/apache/templates/vhost_reverse_proxy.conf @@ -1,4 +1,4 @@ -<%= @content %> +<%= content %> ProxyRequests Off ProxyPreserveHost On @@ -10,6 +10,6 @@ <%- if url =~ /^https/ -%> SSLProxyEngine On <%- end -%> - ProxyPass / <%= @url %> - ProxyPassReverse / <%= @url %> + ProxyPass / <%= url %> + ProxyPassReverse / <%= url %> diff --git a/modules/apache/templates/vhost_simple.conf b/modules/apache/templates/vhost_simple.conf index 77b55287..afc443de 100644 --- a/modules/apache/templates/vhost_simple.conf +++ b/modules/apache/templates/vhost_simple.conf @@ -1,6 +1,6 @@ <VirtualHost *:80> - ServerName <%= @name %> - DocumentRoot <%= @location %> + ServerName <%= name %> + DocumentRoot <%= location %> <Location /> <IfModule mod_authz_core.c> diff --git a/modules/apache/templates/vhost_ssl.conf b/modules/apache/templates/vhost_ssl.conf index d721f0cf..e39e6820 100644 --- a/modules/apache/templates/vhost_ssl.conf +++ b/modules/apache/templates/vhost_ssl.conf @@ -3,11 +3,11 @@ SSLHonorCipherOrder On SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS <%- if wildcard_sslcert == 'true' then -%> - SSLCertificateFile /etc/ssl/wildcard.<%= @domain %>.crt - SSLCertificateKeyFile /etc/ssl/wildcard.<%= @domain %>.key - SSLCACertificateFile /etc/ssl/wildcard.<%= @domain %>.pem + SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt + SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key + SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem SSLVerifyClient None <%- else -%> - SSLCertificateFile /etc/ssl/apache/<%= @real_vhost %>.pem - SSLCertificateKeyFile /etc/ssl/apache/<%= @real_vhost %>.pem + SSLCertificateFile /etc/ssl/apache/<%= real_vhost %>.pem + SSLCertificateKeyFile /etc/ssl/apache/<%= real_vhost %>.pem <%- end -%> diff --git a/modules/apache/templates/vhost_ssl_redirect.conf b/modules/apache/templates/vhost_ssl_redirect.conf index 23a7eabe..d13c3093 100644 --- a/modules/apache/templates/vhost_ssl_redirect.conf +++ b/modules/apache/templates/vhost_ssl_redirect.conf @@ -1 +1 @@ -Redirect / https://<%= @name %>/ +Redirect / https://<%= name %>/ diff --git a/modules/apache/templates/vhost_wsgi.conf b/modules/apache/templates/vhost_wsgi.conf index 2f1ba585..34926411 100644 --- a/modules/apache/templates/vhost_wsgi.conf +++ b/modules/apache/templates/vhost_wsgi.conf @@ -1,3 +1,3 @@ -WSGIScriptAlias / <%= @wsgi_path %> +WSGIScriptAlias / <%= wsgi_path %> diff --git a/modules/auto_installation/templates/default b/modules/auto_installation/templates/default index 637a73b2..a9ea8de3 100644 --- a/modules/auto_installation/templates/default +++ b/modules/auto_installation/templates/default @@ -4,12 +4,12 @@ TIMEOUT 100 NOESCAPE 1 MENU SHIFTKEY 1 -MENU TITLE PXE Boot on <%= @fqdn %> +MENU TITLE PXE Boot on <%= fqdn %> LABEL local MENU LABEL Local localboot 0 <% for m in menu_entries %> -INCLUDE pxelinux.cfg/m/<%= @m %> +INCLUDE pxelinux.cfg/m/<%= m %> <% end %> diff --git a/modules/auto_installation/templates/menu b/modules/auto_installation/templates/menu index 1b32ffb7..3d0ce6fa 100644 --- a/modules/auto_installation/templates/menu +++ b/modules/auto_installation/templates/menu @@ -1,5 +1,5 @@ -LABEL <%= @name %> +LABEL <%= name %> MENU DEFAULT - MENU LABEL Install <%= @label %> - kernel <%= @kernel_path %> - append <%= @append %> + MENU LABEL Install <%= label %> + kernel <%= kernel_path %> + append <%= append %> diff --git a/modules/bcd/templates/sudoers.bcd b/modules/bcd/templates/sudoers.bcd index c462bffd..c597fe5c 100644 --- a/modules/bcd/templates/sudoers.bcd +++ b/modules/bcd/templates/sudoers.bcd @@ -7,4 +7,4 @@ /usr/bin/urpmq, \ /bin/rm -%<%= @isomakers_group %> ALL=(<%= scope.lookupvar('bcd::login') %>) SETENV: NOPASSWD: ALL +%<%= isomakers_group %> ALL=(<%= scope.lookupvar('bcd::login') %>) SETENV: NOPASSWD: ALL diff --git a/modules/bcd/templates/vhost_bcd.conf b/modules/bcd/templates/vhost_bcd.conf index c89955e2..78528e48 100644 --- a/modules/bcd/templates/vhost_bcd.conf +++ b/modules/bcd/templates/vhost_bcd.conf @@ -1,8 +1,8 @@ -<Directory <%= @location %>> +<Directory <%= location %>> AuthUserFile <%= scope.lookupvar('bcd::home') %>/htpasswd AuthGroupFile /dev/null AuthName "QA test isos, restricted access" - ErrorDocument 403 "For the password, please contact the QA team ( https://wiki.<%= @domain %>/en/QA_Team )" + ErrorDocument 403 "For the password, please contact the QA team ( https://wiki.<%= domain %>/en/QA_Team )" AuthType Basic require valid-user diff --git a/modules/bind/templates/named_master.conf b/modules/bind/templates/named_master.conf index 09f6d124..30b3418f 100644 --- a/modules/bind/templates/named_master.conf +++ b/modules/bind/templates/named_master.conf @@ -8,9 +8,9 @@ zone "mageia.org" IN { for tld in managed_tlds %> -zone "mageia.<%= @tld %>" IN { +zone "mageia.<%= tld %>" IN { type master; - file "master/mageia.<%= @tld %>.zone"; + file "master/mageia.<%= tld %>.zone"; allow-update { none; }; }; diff --git a/modules/bind/templates/named_slave.conf b/modules/bind/templates/named_slave.conf index 846017ff..b59db37f 100644 --- a/modules/bind/templates/named_slave.conf +++ b/modules/bind/templates/named_slave.conf @@ -8,7 +8,7 @@ zone "mageia.org" IN { for tld in managed_tlds %> -zone "mageia.<%= @tld %>" IN { +zone "mageia.<%= tld %>" IN { type master; file "master/mageia.<= tld %>"; allow-update { 212.85.158.151; }; diff --git a/modules/blog/templates/backup_blog-db.sh b/modules/blog/templates/backup_blog-db.sh index f238f472..c497cb8f 100755 --- a/modules/blog/templates/backup_blog-db.sh +++ b/modules/blog/templates/backup_blog-db.sh @@ -1,7 +1,7 @@ #!/bin/sh # Initialization -PATH_TO_FILE=${PATH_TO_FILE:-<%= @blog_db_backupdir %>} +PATH_TO_FILE=${PATH_TO_FILE:-<%= blog_db_backupdir %>} [ ! -f $PATH_TO_FILE/count ] && echo 0 > $PATH_TO_FILE/count COUNT=$(cat "$PATH_TO_FILE/count") # Backup each locale DB diff --git a/modules/blog/templates/backup_blog-files.sh b/modules/blog/templates/backup_blog-files.sh index b8639014..e268ad2b 100755 --- a/modules/blog/templates/backup_blog-files.sh +++ b/modules/blog/templates/backup_blog-files.sh @@ -1,7 +1,7 @@ #!/bin/bash # Initialization -PATH_TO_FILE=${PATH_TO_FILE:-<%= @blog_files_backupdir %>} +PATH_TO_FILE=${PATH_TO_FILE:-<%= blog_files_backupdir %>} [ ! -f $PATH_TO_FILE/count ] && echo 0 > $PATH_TO_FILE/count COUNT=$(cat "$PATH_TO_FILE/count") # Backup each locale @@ -12,7 +12,7 @@ do /bin/mkdir $PATH_TO_FILE/$locale fi # use relative paths to avoid "Removing leading `/' from member names'" warning - tar -C / -Jcf "$PATH_TO_FILE/$locale/$locale-$COUNT.tar.xz" "$(sed s,^/,, <<< "<%= @blog_location %>/$locale")" + tar -C / -Jcf "$PATH_TO_FILE/$locale/$locale-$COUNT.tar.xz" "$(sed s,^/,, <<< "<%= blog_location %>/$locale")" done # Check count file to have a week of backup in the directory if [ $COUNT -ne 6 ] diff --git a/modules/blog/templates/blogs_vhosts.conf b/modules/blog/templates/blogs_vhosts.conf index 5c1868bb..ff3c792f 100644 --- a/modules/blog/templates/blogs_vhosts.conf +++ b/modules/blog/templates/blogs_vhosts.conf @@ -1,4 +1,4 @@ -<Directory <%= @blog_location %> > +<Directory <%= blog_location %> > Order deny,allow Allow from All AllowOverride All diff --git a/modules/blog/templates/check_new-blog-post.sh b/modules/blog/templates/check_new-blog-post.sh index 59181184..f2089a52 100755 --- a/modules/blog/templates/check_new-blog-post.sh +++ b/modules/blog/templates/check_new-blog-post.sh @@ -34,7 +34,7 @@ if [ "$tmp_old" = "$tmp_new" ] then # Modification on latest post echo "YES - Modification" >> $PATH_TO_FILE"/last_check" - echo -e "The latest blog post has been modified and needs to be checked!\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= @blog_newpost_email_from %>' -s "Modification of the latest entry on English Blog" <%= @blog_newpost_email_to %> + echo -e "The latest blog post has been modified and needs to be checked!\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= blog_newpost_email_from %>' -s "Modification of the latest entry on English Blog" <%= blog_newpost_email_to %> echo $DATE else echo "NO" >> $PATH_TO_FILE"/last_check" @@ -42,7 +42,7 @@ if [ "$tmp_old" = "$tmp_new" ] else # New post to translate echo "YES - New entry" >> $PATH_TO_FILE"/last_check" - echo -e "A new blog post is waiting for translation:\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= @blog_newpost_email_from %>' -s "New entry on English Blog" <%= @blog_newpost_email_to %> + echo -e "A new blog post is waiting for translation:\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= blog_newpost_email_from %>' -s "New entry on English Blog" <%= blog_newpost_email_to %> echo $DATE fi diff --git a/modules/bugzilla-dev/templates/localconfig b/modules/bugzilla-dev/templates/localconfig index 7e9925a5..2b7d6035 100755 --- a/modules/bugzilla-dev/templates/localconfig +++ b/modules/bugzilla-dev/templates/localconfig @@ -64,7 +64,7 @@ $db_user = 'bugs'; # If you use apostrophe (') or a backslash (\) in your password, you'll # need to escape it by preceding it with a '\' character. (\') or (\) # (It is far simpler to just not use those characters.) -$db_pass = '<%= @pgsql_password %>'; +$db_pass = '<%= pgsql_password %>'; # Sometimes the database server is running on a non-standard port. If that's # the case for your database server, set this to the port number that your diff --git a/modules/bugzilla-dev/templates/params.json b/modules/bugzilla-dev/templates/params.json index f6b00aa9..b51b4c00 100644 --- a/modules/bugzilla-dev/templates/params.json +++ b/modules/bugzilla-dev/templates/params.json @@ -1,9 +1,9 @@ { - "LDAPBaseDN" : "ou=People,<%= @dc_suffix %>", - "LDAPbinddn" : "cn=bugzilla-alamut,ou=System Accounts,<%= @dc_suffix %>:<%= @ldap_password %>", + "LDAPBaseDN" : "ou=People,<%= dc_suffix %>", + "LDAPbinddn" : "cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>", "LDAPfilter" : "", "LDAPmailattribute" : "mail", - "LDAPserver" : "ldap.<%= @domain %>", + "LDAPserver" : "ldap.<%= domain %>", "LDAPstarttls" : "1", "LDAPuidattribute" : "uid", "RADIUS_NAS_IP" : "", @@ -49,8 +49,8 @@ "letsubmitterchoosemilestone" : "1", "letsubmitterchoosepriority" : "1", "mail_delivery_method" : "SMTP", - "mailfrom" : "bugzilla-daemon@<%= @domain %>", - "maintainer" : "sysadmin@group.<%= @domain %>", + "mailfrom" : "bugzilla-daemon@<%= domain %>", + "maintainer" : "sysadmin@group.<%= domain %>", "makeproductgroups" : "0", "max_search_results" : "10000", "maxattachmentsize" : "1000", @@ -81,12 +81,12 @@ "smtp_username" : "", "smtpserver" : "localhost", "ssl_redirect" : "1", - "sslbase" : "https://bugs-dev.<%= @domain %>/", + "sslbase" : "https://bugs-dev.<%= domain %>/", "strict_isolation" : "0", "strict_transport_security" : "off", "timetrackinggroup" : "", "upgrade_notification" : "latest_stable_release", - "urlbase" : "http://bugs-dev.<%= @domain %>/", + "urlbase" : "http://bugs-dev.<%= domain %>/", "use_mailer_queue" : "0", "use_see_also" : "1", "useclassification" : "0", diff --git a/modules/bugzilla-dev/templates/webapp_bugzilla.conf b/modules/bugzilla-dev/templates/webapp_bugzilla.conf index b8194c00..a8f37a00 100755 --- a/modules/bugzilla-dev/templates/webapp_bugzilla.conf +++ b/modules/bugzilla-dev/templates/webapp_bugzilla.conf @@ -11,7 +11,7 @@ path_data_directory = "/var/lib/bugzilla" # The duplicates.rdf must be accessible, as it is used by # duplicates.xul -<Directory <%= @path_data_directory %>> +<Directory <%= path_data_directory %>> <Files duplicates.rdf> <IfModule mod_authz_core.c> # Apache 2.4 @@ -26,7 +26,7 @@ path_data_directory = "/var/lib/bugzilla" </Directory> # The png files locally created locally must be accessible -<Directory <%= @path_data_directory %>/webdot> +<Directory <%= path_data_directory %>/webdot> <FilesMatch \.png$> <IfModule mod_authz_core.c> # Apache 2.4 @@ -40,8 +40,8 @@ path_data_directory = "/var/lib/bugzilla" </FilesMatch> </Directory> -Alias /graphs/ <%= @path_data_directory %>/graphs/ -<Directory <%= @path_data_directory %>/graphs> +Alias /graphs/ <%= path_data_directory %>/graphs/ +<Directory <%= path_data_directory %>/graphs> <FilesMatch \.png$> <IfModule mod_authz_core.c> # Apache 2.4 diff --git a/modules/bugzilla/templates/localconfig b/modules/bugzilla/templates/localconfig index 3f5b4a7e..61935552 100644 --- a/modules/bugzilla/templates/localconfig +++ b/modules/bugzilla/templates/localconfig @@ -64,7 +64,7 @@ $db_user = 'bugs'; # If you use apostrophe (') or a backslash (\) in your password, you'll # need to escape it by preceding it with a '\' character. (\') or (\) # (It is far simpler to just not use those characters.) -$db_pass = '<%= @pgsql_password %>'; +$db_pass = '<%= pgsql_password %>'; # Sometimes the database server is running on a non-standard port. If that's # the case for your database server, set this to the port number that your @@ -124,4 +124,4 @@ $diffpath = '/usr/bin'; # security features in Bugzilla, to protect against certain types of attacks. # A random string is generated by default. It's very important that this key # is kept secret. It also must be very long. -$site_wide_secret = '<%= @bugzilla_secret_key %>'; +$site_wide_secret = '<%= bugzilla_secret_key %>'; diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params index a2561d6a..2e71a39d 100644 --- a/modules/bugzilla/templates/params +++ b/modules/bugzilla/templates/params @@ -1,9 +1,9 @@ %param = ( - 'LDAPBaseDN' => 'ou=People,<%= @dc_suffix %>', - 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= @dc_suffix %>:<%= @ldap_password %>', + 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', + 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>', 'LDAPfilter' => '', 'LDAPmailattribute' => 'mail', - 'LDAPserver' => 'ldap.<%= @domain %>', + 'LDAPserver' => 'ldap.<%= domain %>', 'LDAPstarttls' => '1', 'LDAPuidattribute' => 'uid', 'RADIUS_NAS_IP' => '', @@ -45,7 +45,7 @@ 'emailregexp' => '^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$', 'emailregexpdesc' => 'A legal address must contain exactly one \'@\', and at least one \'.\' after the @.', 'emailsuffix' => '', - 'globalwatchers' => 'bugs@ml.<%= @domain %>', + 'globalwatchers' => 'bugs@ml.<%= domain %>', 'inbound_proxies' => '', 'insidergroup' => 'secteam', 'letsubmitterchoosemilestone' => 1, @@ -53,8 +53,8 @@ 'lxr_root' => '', 'lxr_url' => '', 'mail_delivery_method' => 'SMTP', - 'mailfrom' => 'bugzilla_noreply@ml.<%= @domain %>', - 'maintainer' => 'sysadmin@group.<%= @domain %>', + 'mailfrom' => 'bugzilla_noreply@ml.<%= domain %>', + 'maintainer' => 'sysadmin@group.<%= domain %>', 'makeproductgroups' => 0, 'maxattachmentsize' => '1000', 'maxlocalattachment' => '0', @@ -88,11 +88,11 @@ 'smtpserver' => 'localhost', 'specific_search_allow_empty_words' => 1, 'ssl_redirect' => 1, - 'sslbase' => 'https://bugs.<%= @domain %>/', + 'sslbase' => 'https://bugs.<%= domain %>/', 'strict_isolation' => 0, 'timetrackinggroup' => '', 'upgrade_notification' => 'latest_stable_release', - 'urlbase' => 'https://bugs.<%= @domain %>/', + 'urlbase' => 'https://bugs.<%= domain %>/', 'use_mailer_queue' => 0, 'use_see_also' => 1, 'usebugaliases' => 0, diff --git a/modules/bugzilla/templates/params.json b/modules/bugzilla/templates/params.json index 892d6400..05325bc7 100644 --- a/modules/bugzilla/templates/params.json +++ b/modules/bugzilla/templates/params.json @@ -1,9 +1,9 @@ { - "LDAPBaseDN" : "ou=People,<%= @dc_suffix %>", - "LDAPbinddn" : "cn=bugzilla-alamut,ou=System Accounts,<%= @dc_suffix %>:<%= @ldap_password %>", + "LDAPBaseDN" : "ou=People,<%= dc_suffix %>", + "LDAPbinddn" : "cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>", "LDAPfilter" : "", "LDAPmailattribute" : "mail", - "LDAPserver" : "ldap.<%= @domain %>", + "LDAPserver" : "ldap.<%= domain %>", "LDAPstarttls" : "1", "LDAPuidattribute" : "uid", "RADIUS_NAS_IP" : "", @@ -49,8 +49,8 @@ "letsubmitterchoosemilestone" : "1", "letsubmitterchoosepriority" : "1", "mail_delivery_method" : "SMTP", - "mailfrom" : "bugzilla_noreply@ml.<%= @domain %>", - "maintainer" : "sysadmin@group.<%= @domain %>", + "mailfrom" : "bugzilla_noreply@ml.<%= domain %>", + "maintainer" : "sysadmin@group.<%= domain %>", "makeproductgroups" : "0", "max_search_results" : "10000", "maxattachmentsize" : "1000", @@ -81,12 +81,12 @@ "smtp_username" : "", "smtpserver" : "localhost", "ssl_redirect" : "1", - "sslbase" : "https://bugs.<%= @domain %>/", + "sslbase" : "https://bugs.<%= domain %>/", "strict_isolation" : "0", "strict_transport_security" : "off", "timetrackinggroup" : "", "upgrade_notification" : "latest_stable_release", - "urlbase" : "https://bugs.<%= @domain %>/", + "urlbase" : "https://bugs.<%= domain %>/", "use_mailer_queue" : "0", "use_see_also" : "1", "useclassification" : "0", diff --git a/modules/bugzilla/templates/webapp_bugzilla.conf b/modules/bugzilla/templates/webapp_bugzilla.conf index 6873a842..d2e3f395 100644 --- a/modules/bugzilla/templates/webapp_bugzilla.conf +++ b/modules/bugzilla/templates/webapp_bugzilla.conf @@ -2,7 +2,7 @@ path_data_directory = "/usr/share/bugzilla/" %> -<Directory <%= @path_data_directory %> > +<Directory <%= path_data_directory %> > AddHandler cgi-script .cgi Options +ExecCGI +FollowSymLinks DirectoryIndex index.cgi index.html diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf index 15718130..2dd8bf0e 100644 --- a/modules/buildsystem/templates/iurt.conf +++ b/modules/buildsystem/templates/iurt.conf @@ -1,18 +1,18 @@ <%- distro = scope.lookupvar('buildsystem::var::distros::distros')[@distribution] -%> { - supported_arch => [ '<%= @distro['arch'].join("', '") %>' ], + supported_arch => [ '<%= distro['arch'].join("', '") %>' ], all_media =>{ <%- distro['medias'].keys.sort.each{|media| -%> - '<%= @media %>' => [ '<%= + '<%= media %>' => [ '<%= distro['medias'][media]['repos'].keys.sort.join("', '") %>' ], <%- } -%> }, - distribution => '<%= @distro['macros']['distribution'] %>', - vendor => '<%= @distro['macros']['vendor'] %>', - base_media => [ '<%= @distro['base_media'].join("', '") %>' ], - upload => '<%= @build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= @build_login %>@pkgsubmit:~/uploads/queue/', + distribution => '<%= distro['macros']['distribution'] %>', + vendor => '<%= distro['macros']['vendor'] %>', + base_media => [ '<%= distro['base_media'].join("', '") %>' ], + upload => '<%= build_login %>@pkgsubmit:~/uploads/', + upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', unwanted_packages => '^monotone-', repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/', log_url => 'https://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/queue/build/', @@ -22,14 +22,14 @@ log_size_limit => '600M', build_timeout => { <%- build_timeout.keys.sort.each{|package| -%> - '<%= @package %>' => <%= (@build_timeout[package].to_f * scope.lookupvar('buildsystem::var::iurt::timeout_multiplier').to_f).to_i %>, + '<%= package %>' => <%= (build_timeout[package].to_f * scope.lookupvar('buildsystem::var::iurt::timeout_multiplier').to_f).to_i %>, <%- } -%> }, use_netns => { 'default' => 1, <%- allow_network_access.sort.each{|package| -%> - '<%= @package %>' => 0, + '<%= package %>' => 0, <%- } -%> }, diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg index 565c8c13..64757a2b 100644 --- a/modules/buildsystem/templates/media.cfg +++ b/modules/buildsystem/templates/media.cfg @@ -26,9 +26,9 @@ end distro = scope.lookupvar('buildsystem::var::distros::distros')[@distro_name] -%> [media_info] -version=<%= @distro['version'] %> +version=<%= distro['version'] %> mediacfg_version=2 -branch=<%= @distro['branch'] %> +branch=<%= distro['branch'] %> <%- if @arch != 'armv7hl' -%> diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index 80675cce..fbe5109c 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -4,16 +4,16 @@ -%> [global] verbose = no -default_parent = <%= scope.lookupvar('buildsystem::var::mgarepo::svn_root_packages') %>/<%= @default_distro %> +default_parent = <%= scope.lookupvar('buildsystem::var::mgarepo::svn_root_packages') %>/<%= default_distro %> #url-map = svn\+ssh://svn\.mageia\.org/(.*) file:///\1 -tempdir = <%= @sched_home_dir %>/repsys/tmp -trunk-dir = <%= @default_distro %> +tempdir = <%= sched_home_dir %>/repsys/tmp +trunk-dir = <%= default_distro %> <%- conf = scope.lookupvar('buildsystem::var::mgarepo::conf') if conf['global'] != nil conf['global'].keys.sort.each{|key| value = conf['global'][key] - -%><%= @key %> = <%= @value %> + -%><%= key %> = <%= value %> <%- } end @@ -33,20 +33,20 @@ ignore-string = SILENT path = /usr/share/mgarepo/default.chlog [users] -iurt = Mageia build bot <mageia-sysadm@<%= @domain %>> +iurt = Mageia build bot <mageia-sysadm@<%= domain %>> [submit] -default = <%= @default_distro %> +default = <%= default_distro %> host = <%= scope.lookupvar('buildsystem::var::mgarepo::submit_host') %> <%- distros.keys.sort.each{|d| distro = distros[d] -%> -[submit <%= @d %>] -target = <%= @sched_home_dir %>/repsys/srpms -allowed = <%= @distro['submit_allowed'] %> <%= @distro['backports_allowed'] %> -rpm-macros = global <%= @d %> +[submit <%= d %>] +target = <%= sched_home_dir %>/repsys/srpms +allowed = <%= distro['submit_allowed'] %> <%= distro['backports_allowed'] %> +rpm-macros = global <%= d %> <%- } @@ -61,12 +61,12 @@ dist = %{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_r distros.keys.sort.each{|d| distro = distros[d] -%> -[macros <%= @d %>] -distro_release = <%= @distro['version'] %> +[macros <%= d %>] +distro_release = <%= distro['version'] %> <%- distro['macros'].keys.sort.each{|macro| value = distro['macros'][macro] - -%><%= @macro %> = <%= @value %> + -%><%= macro %> = <%= value %> <%- } %> <%- } %> @@ -83,6 +83,6 @@ run-prep = yes [binrepo] <%- binrepo_hostname = scope.lookupvar('buildsystem::var::binrepo::hostname') -%> -download_url = http://<%= @binrepo_hostname %>/ -upload_host = <%= @binrepo_hostname %> +download_url = http://<%= binrepo_hostname %>/ +upload_host = <%= binrepo_hostname %> diff --git a/modules/buildsystem/templates/repoctl.conf b/modules/buildsystem/templates/repoctl.conf index 9c148046..14506a25 100644 --- a/modules/buildsystem/templates/repoctl.conf +++ b/modules/buildsystem/templates/repoctl.conf @@ -27,12 +27,12 @@ lockdir=/var/lib/repoctl/locks hdlistsdir=/var/lib/repoctl/hdlists rootdir=<%= scope.lookupvar('buildsystem::var::repository::bootstrap_root') %> finalrootdir=<%= scope.lookupvar('buildsystem::var::repository::mirror_root') %> -distribdir=$rootdir/<%= @distribdir %> -finaldistribdir=$finalrootdir/<%= @distribdir %> -distroreleases='<%= @distros.keys.sort.join(' ') -%>' -distrosections='<%= @distrosections.keys.sort.join(' ') -%>' -sectionsrepos='<%= @sectionsrepos.keys.sort.join(' ') -%>' -arches='<%= @arches.keys.sort.join(' ') -%>' +distribdir=$rootdir/<%= distribdir %> +finaldistribdir=$finalrootdir/<%= distribdir %> +distroreleases='<%= distros.keys.sort.join(' ') -%>' +distrosections='<%= distrosections.keys.sort.join(' ') -%>' +sectionsrepos='<%= sectionsrepos.keys.sort.join(' ') -%>' +arches='<%= arches.keys.sort.join(' ') -%>' mirror_rsync_options="-v --delete -alH" timestampfile="mageia_timestamp" sha1sumfile="mageia_sha1sum" diff --git a/modules/buildsystem/templates/signbot/sudoers.signpackage b/modules/buildsystem/templates/signbot/sudoers.signpackage index 7a5ff7c2..4ea30238 100644 --- a/modules/buildsystem/templates/signbot/sudoers.signpackage +++ b/modules/buildsystem/templates/signbot/sudoers.signpackage @@ -1,2 +1,2 @@ -<%= @sched_login %> ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/mga-signpackage -<%= @sched_login %> ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/sign-check-package +<%= sched_login %> ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/mga-signpackage +<%= sched_login %> ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/sign-check-package diff --git a/modules/buildsystem/templates/sudoers.youri b/modules/buildsystem/templates/sudoers.youri index 8e7ec8bf..3bc7cc2d 100644 --- a/modules/buildsystem/templates/sudoers.youri +++ b/modules/buildsystem/templates/sudoers.youri @@ -1,6 +1,6 @@ <%- sched_login = scope.lookupvar('buildsystem::var::scheduler::login') -%> Cmnd_Alias YOURI = /usr/local/bin/mga-youri-submit.wrapper Defaults!YOURI always_set_home -Defaults!YOURI runas_default = <%= @sched_login %> +Defaults!YOURI runas_default = <%= sched_login %> Defaults!YOURI !requiretty -%<%= scope.lookupvar('buildsystem::var::groups::packagers') -%> ALL = (<%= @sched_login %>) NOPASSWD: YOURI +%<%= scope.lookupvar('buildsystem::var::groups::packagers') -%> ALL = (<%= sched_login %>) NOPASSWD: YOURI diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index c481c6ef..af610c92 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -14,7 +14,7 @@ my %nodes = ( <%- build_nodes.keys.sort.each{|arch| -%> - <%= @arch -%> => [ '<%= @build_nodes[arch].join("', '") -%>' ], + <%= arch -%> => [ '<%= build_nodes[arch].join("', '") -%>' ], <%- } -%> @@ -77,7 +77,7 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; distros = scope.lookupvar('buildsystem::var::distros::distros') distros.keys.sort.each{|distroname| -%> - '<%= @distroname -%>' => { + '<%= distroname -%>' => { <%- distro = distros[distroname] distro['medias'].keys.sort.each{|medianame| @@ -85,7 +85,7 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; media['repos'].keys.sort.each{|reponame| deps = repo_deps(distros, distroname, medianame, reponame) -%> - "<%= [ @medianame, @reponame ].join('/') %>" => [ "<%= + "<%= [ medianame, reponame ].join('/') %>" => [ "<%= deps.keys.sort.join('", "') %>" ], <%- @@ -100,12 +100,12 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; admin => '<%= scope.lookupvar('buildsystem::var::scheduler::admin_mail') %>', http_queue => 'https://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/uploads', upload_user => '<%= scope.lookupvar('buildsystem::var::scheduler::login') %>', - email_domain => '<%= @domain %>', + email_domain => '<%= domain %>', arch => { <%- distros.keys.sort.each{|distroname| -%> - <%= @distroname -%> => [ '<%= @distros[distroname]['arch'].join("', '") %>' ], + <%= distroname -%> => [ '<%= distros[distroname]['arch'].join("', '") %>' ], <%- } -%> @@ -120,7 +120,7 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; march = distros[distroname]['arch'] end -%> - <%= @distroname -%> => [ '<%= @march.join("', '") %>' ], + <%= distroname -%> => [ '<%= march.join("', '") %>' ], <%- } -%> diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf index 3dbdfc46..e082ffca 100644 --- a/modules/buildsystem/templates/vhost_repository.conf +++ b/modules/buildsystem/templates/vhost_repository.conf @@ -9,7 +9,7 @@ distros = scope.lookupvar('buildsystem::var::distros::distros') -%> <VirtualHost *:80> ServerName <%= scope.lookupvar('buildsystem::var::repository::hostname') %> - DocumentRoot <%= @mirror_root %> + DocumentRoot <%= mirror_root %> # Some simple API to check existence of SRPMs for QA RewriteEngine On @@ -36,35 +36,35 @@ distros = scope.lookupvar('buildsystem::var::distros::distros') access_requires = [ 'all granted' ] end %> - Alias /bootstrap/ "<%= @bootstrap_reporoot %>/" + Alias /bootstrap/ "<%= bootstrap_reporoot %>/" <%- distros.keys.sort.each{|distroname| distro = distros[distroname] if distro['no_mirror'] -%> - Alias /<%= @distribdir %>/<%= @distroname %>/ "<%= @bootstrap_reporoot %>/<%= @distroname %>/" + Alias /<%= distribdir %>/<%= distroname %>/ "<%= bootstrap_reporoot %>/<%= distroname %>/" <%- end } -%> - <Directory <%= @bootstrap_reporoot %>> + <Directory <%= bootstrap_reporoot %>> Header append Cache-Control "public, must-revalidate" <%- for req in access_requires do -%> - Require <%= @req %> + Require <%= req %> <%- end -%> Options Indexes FollowSymLinks </Directory> - <Directory <%= @mirror_root %>> + <Directory <%= mirror_root %>> Header append Cache-Control "public, must-revalidate" <%- for req in access_requires do -%> - Require <%= @req %> + Require <%= req %> <%- end -%> diff --git a/modules/buildsystem/templates/youri/host.conf b/modules/buildsystem/templates/youri/host.conf index 90964486..bf4fa086 100644 --- a/modules/buildsystem/templates/youri/host.conf +++ b/modules/buildsystem/templates/youri/host.conf @@ -20,4 +20,4 @@ } } -%> -<%= @str -%> +<%= str -%> diff --git a/modules/buildsystem/templates/youri/submit.conf b/modules/buildsystem/templates/youri/submit.conf index 337f667d..0d7cf927 100644 --- a/modules/buildsystem/templates/youri/submit.conf +++ b/modules/buildsystem/templates/youri/submit.conf @@ -93,7 +93,7 @@ def get_definitions(def_name, conf_name, conf, conf_default, distros) end %> -home: <%= @sched_home_dir %> +home: <%= sched_home_dir %> <%- repository = { @@ -108,7 +108,7 @@ home: <%= @sched_home_dir %> } -%> # repository declaration -<%= hash_text(@repository, 0) %> +<%= hash_text(repository, 0) %> <%- targets = { @@ -116,25 +116,25 @@ home: <%= @sched_home_dir %> } -%> # targets definition -<%= hash_text(@targets, 0) %> +<%= hash_text(targets, 0) %> <%- checks = get_definitions('checks', conf_name, conf, conf_default, distros) -%> # checks definition -<%= hash_text(@checks, 0) -%> +<%= hash_text(checks, 0) -%> <%- actions = get_definitions('actions', conf_name, conf, conf_default, distros) -%> # actions definitions -<%= hash_text(@actions, 0) -%> +<%= hash_text(actions, 0) -%> <%- posts = get_definitions('posts', conf_name, conf, conf_default, distros) -%> # posts definitions -<%= hash_text(@posts, 0) -%> +<%= hash_text(posts, 0) -%> # vim:ft=yaml:et:sw=4 diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml index 5d0a36c9..b23ee46c 100644 --- a/modules/catdap/templates/catdap_local.yml +++ b/modules/catdap/templates/catdap_local.yml @@ -6,16 +6,16 @@ ldap_account = "cn=catdap-#{hostname},ou=System Accounts,#{dc_suffix}" organisation: Mageia apptitle: Mageia Identity Management -emailfrom: noreply@<%= @domain %> +emailfrom: noreply@<%= domain %> Model::Proxy: - base: ou=People,<%= @dc_suffix %> - dn: <%= @ldap_account %> + base: ou=People,<%= dc_suffix %> + dn: <%= ldap_account %> password: <%= scope.lookupvar("catdap::ldap_password") %> Model::User: - base: <%= @dc_suffix %> - host: <%= @ldap_server %> + base: <%= dc_suffix %> + host: <%= ldap_server %> start_tls: 1 authentication: @@ -23,11 +23,11 @@ authentication: realms: ldap: store: - ldap_server: <%= @ldap_server %> - binddn: <%= @ldap_account %> + ldap_server: <%= ldap_server %> + binddn: <%= ldap_account %> bindpw: <%= scope.lookupvar("catdap::ldap_password") %> - user_basedn: ou=People,<%= @dc_suffix %> - role_basedn: <%= @dc_suffix %> + user_basedn: ou=People,<%= dc_suffix %> + role_basedn: <%= dc_suffix %> register: login_regex: ^[a-z][a-z0-9]*$ diff --git a/modules/dashboard/templates/make_report b/modules/dashboard/templates/make_report index 5da59617..25c2f316 100644 --- a/modules/dashboard/templates/make_report +++ b/modules/dashboard/templates/make_report @@ -1,7 +1,7 @@ #!/bin/sh -dashboard_dir='<%= @dashboard_dir %>' -dashboard_wwwdir='<%= @dashboard_wwwdir %>' +dashboard_dir='<%= dashboard_dir %>' +dashboard_wwwdir='<%= dashboard_wwwdir %>' cd "$dashboard_dir" /usr/bin/php ./make_report.php > "$dashboard_wwwdir/index.html" diff --git a/modules/draklive/templates/sudoers.draklive b/modules/draklive/templates/sudoers.draklive index 8d546396..25cea69e 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 +<%= login %> ALL=(root) NOPASSWD: /usr/sbin/draklive +<%= login %> ALL=(root) NOPASSWD: /usr/bin/draklive2 +%<%= isomakers_group %> ALL=(<%= login %>) SETENV: NOPASSWD: ALL diff --git a/modules/git/templates/xinetd b/modules/git/templates/xinetd index 654ae2be..2cbf78e3 100644 --- a/modules/git/templates/xinetd +++ b/modules/git/templates/xinetd @@ -4,10 +4,10 @@ service git type = UNLISTED port = 9418 socket_type = stream - server = <%= @lib_dir %>/git-core/git-daemon + server = <%= lib_dir %>/git-core/git-daemon wait = no user = nobody - server_args = --inetd --verbose --export-all --base-path=<%= @git_base_path %> + server_args = --inetd --verbose --export-all --base-path=<%= git_base_path %> log_on_failure += HOST flags = IPv6 } diff --git a/modules/gnupg/templates/batch b/modules/gnupg/templates/batch index d55bdd52..f4be84d9 100644 --- a/modules/gnupg/templates/batch +++ b/modules/gnupg/templates/batch @@ -1,8 +1,8 @@ %echo Generating a standard key -Key-Type: <%= @key_type %> -Key-Length: <%= @key_length %> -Name-Real: <%= @key_name %> -Name-Email: <%= @email %> -Expire-Date: <%= @expire_date %> +Key-Type: <%= key_type %> +Key-Length: <%= key_length %> +Name-Real: <%= key_name %> +Name-Email: <%= email %> +Expire-Date: <%= expire_date %> %commit %echo done diff --git a/modules/icecream/templates/sysconfig b/modules/icecream/templates/sysconfig index 8a5bc92c..36c511f2 100644 --- a/modules/icecream/templates/sysconfig +++ b/modules/icecream/templates/sysconfig @@ -55,7 +55,7 @@ ICECREAM_NETNAME="" # If the daemon can't find the scheduler by broadcast (e.g. because # of a firewall) you can specify it. # -ICECREAM_SCHEDULER_HOST="<%= @host %>" +ICECREAM_SCHEDULER_HOST="<%= host %>" # ## Type: string diff --git a/modules/ii/templates/ii_wrapper.pl b/modules/ii/templates/ii_wrapper.pl index 68128314..5e5cc65e 100644 --- a/modules/ii/templates/ii_wrapper.pl +++ b/modules/ii/templates/ii_wrapper.pl @@ -3,8 +3,8 @@ use warnings; use strict; use POSIX; use Proc::Daemon; -my $nick = "<%= @nick %>"; -my $server = "<%= @server %>"; +my $nick = "<%= nick %>"; +my $server = "<%= server %>"; Proc::Daemon::Init(); diff --git a/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla b/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla index 8806e3cb..201e89a0 100644 --- a/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla +++ b/modules/libvirtd/templates/50-template-libvirt-remote-access.pkla @@ -1,5 +1,5 @@ [Remote libvirt SSH access] -Identity=unix-user:root;unix-group:<%= @name %> +Identity=unix-user:root;unix-group:<%= name %> Action=org.libvirt.unix.manage ResultAny=yes ResultInactive=yes diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php index c340dfd9..36b3054f 100644 --- a/modules/mediawiki/templates/LocalSettings.php +++ b/modules/mediawiki/templates/LocalSettings.php @@ -24,7 +24,7 @@ set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_includ ## Uncomment this to disable output compression # $wgDisableOutputCompression = true; -$wgSitename = "<%= @title %>"; +$wgSitename = "<%= title %>"; # $wgMetaNamespace = ""; # Defaults to $wgSitename ## The URL base path to the directory containing the wiki; @@ -32,7 +32,7 @@ $wgSitename = "<%= @title %>"; ## For more information on customizing the URLs ## (like /w/index.php/Page_title to /wiki/Page_title) please see: ## https://www.mediawiki.org/wiki/Manual:Short_URL -$wgScriptPath = "/<%= @path %>"; +$wgScriptPath = "/<%= path %>"; ## The protocol and server name to use in fully-qualified URLs $wgServer = "https://wiki.mageia.org"; @@ -52,8 +52,8 @@ $wgLogo = "$wgStylePath/common/images/wiki_mga.png"; $wgEnableEmail = true; $wgEnableUserEmail = true; # UPO -$wgEmergencyContact = "root@<%= @domain %>"; -$wgPasswordSender = "wiki_noreply@ml.<%= @domain %>"; +$wgEmergencyContact = "root@<%= domain %>"; +$wgPasswordSender = "wiki_noreply@ml.<%= domain %>"; $wgEnotifUserTalk = true; # UPO $wgEnotifWatchlist = true; # UPO @@ -61,10 +61,10 @@ $wgEmailAuthentication = true; ## Database settings $wgDBtype = "postgres"; -$wgDBserver = "pg.<%= @domain %>"; -$wgDBname = "<%= @db_name %>"; -$wgDBuser = "<%= @db_user %>"; -$wgDBpassword = "<%= @db_password %>"; +$wgDBserver = "pg.<%= domain %>"; +$wgDBname = "<%= db_name %>"; +$wgDBuser = "<%= db_user %>"; +$wgDBpassword = "<%= db_password %>"; # Postgres specific settings $wgDBport = "5432"; @@ -97,22 +97,22 @@ $wgShellLocale = "en_US.UTF-8"; # This seems actually mandatory to get the Vector skin to work properly # https://serverfault.com/a/744059 # FIXME: Dehardcode that path (maybe via ${wiki_root} if exposed?) -$wgCacheDirectory = "/srv/wiki/<%= @path %>/cache"; +$wgCacheDirectory = "/srv/wiki/<%= path %>/cache"; -$wgUploadDirectory = "/srv/wiki/<%= @path %>/images"; +$wgUploadDirectory = "/srv/wiki/<%= path %>/images"; # This seems mandatory to get the Vector skin to work properly # https://phabricator.wikimedia.org/T119934 # FIXME: Dehardcode that path (maybe via ${wiki_root} if exposed?) -$wgTmpDirectory = "/srv/wiki/<%= @path %>/tmp"; +$wgTmpDirectory = "/srv/wiki/<%= path %>/tmp"; # Array of interwiki prefixes for current wiki. $wgLocalInterwikis = array( strtolower( $wgSitename ) ); # Site language code, should be one of the list in ./languages/data/Names.php -$wgLanguageCode = "<%= @lang %>"; +$wgLanguageCode = "<%= lang %>"; -$wgSecretKey = "<%= @secret_key %>"; +$wgSecretKey = "<%= secret_key %>"; # Changing this will log out all existing sessions. $wgAuthenticationTokenVersion = "1"; @@ -180,19 +180,19 @@ $wgLDAPUseLocal = false; $wgLDAPDomainNames = array( 'ldap' ); # TODO make it workable with more than one server -$wgLDAPServerNames = array( 'ldap' => 'ldap.<%= @domain %>' ); +$wgLDAPServerNames = array( 'ldap' => 'ldap.<%= domain %>' ); -$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= @dc_suffix %>' ); +$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= dc_suffix %>' ); $wgLDAPEncryptionType = array( 'ldap' => 'tls' ); -$wgLDAPBaseDNs = array( 'ldap' => '<%= @dc_suffix %>' ); -$wgLDAPUserBaseDNs = array( 'ldap' => 'ou=People,<%= @dc_suffix %>' ); -$wgLDAPGroupBaseDNs = array ( 'ldap' => 'ou=Group,<%= @dc_suffix %>' ); +$wgLDAPBaseDNs = array( 'ldap' => '<%= dc_suffix %>' ); +$wgLDAPUserBaseDNs = array( 'ldap' => 'ou=People,<%= dc_suffix %>' ); +$wgLDAPGroupBaseDNs = array ( 'ldap' => 'ou=Group,<%= dc_suffix %>' ); -$wgLDAPProxyAgent = array( 'ldap' => 'cn=mediawiki-alamut,ou=System Accounts,<%= @dc_suffix %>' ); +$wgLDAPProxyAgent = array( 'ldap' => 'cn=mediawiki-alamut,ou=System Accounts,<%= dc_suffix %>' ); -$wgLDAPProxyAgentPassword = array( 'ldap' => '<%= @ldap_password %>' ); +$wgLDAPProxyAgentPassword = array( 'ldap' => '<%= ldap_password %>' ); $wgLDAPUseLDAPGroups = array( 'ldap' => true ); $wgLDAPGroupNameAttribute = array( 'ldap' => 'cn' ); @@ -205,4 +205,4 @@ $wgLDAPLowerCaseUsername = array( 'ldap' => true ); $wgLDAPPreferences = array( 'ldap' => array( 'email'=>'mail','realname'=>'cn','nickname'=>'uid','language'=>'preferredlanguage') ); -<%= @wiki_settings %> +<%= wiki_settings %> diff --git a/modules/mediawiki/templates/wiki_vhost.conf b/modules/mediawiki/templates/wiki_vhost.conf index 1ae3492d..3fe038c3 100644 --- a/modules/mediawiki/templates/wiki_vhost.conf +++ b/modules/mediawiki/templates/wiki_vhost.conf @@ -1,9 +1,9 @@ # heavily used by the wiki farm stuff -<Directory <%= @root %>> +<Directory <%= root %>> Options +FollowSymLinks </Directory> -<Directory <%= @root %>/images> +<Directory <%= root %>/images> SetHandler default-handler </Directory> diff --git a/modules/mga-mirrors/templates/mga-mirrors.ini b/modules/mga-mirrors/templates/mga-mirrors.ini index b438edd1..b0703f28 100644 --- a/modules/mga-mirrors/templates/mga-mirrors.ini +++ b/modules/mga-mirrors/templates/mga-mirrors.ini @@ -1,4 +1,4 @@ [db] -pgconn=host=pg.<%= @domain %>;dbname=mirrors +pgconn=host=pg.<%= domain %>;dbname=mirrors user=mirrors -password=<%= @pgsql_password %> +password=<%= pgsql_password %> diff --git a/modules/mgasoft/templates/mgasoft.conf b/modules/mgasoft/templates/mgasoft.conf index 81cce013..eaf6e416 100644 --- a/modules/mgasoft/templates/mgasoft.conf +++ b/modules/mgasoft/templates/mgasoft.conf @@ -1,5 +1,5 @@ svn_soft=svn+ssh://svn.mageia.org/svn/soft -anonsvn_soft=<%= @anonsvn_soft %> -svn_soft_publish=<%= @svn_soft_publish %> -pubinfodir=<%= @pubinfodir %> -pubmirrordir=<%= @pubmirrordir %> +anonsvn_soft=<%= anonsvn_soft %> +svn_soft_publish=<%= svn_soft_publish %> +pubinfodir=<%= pubinfodir %> +pubmirrordir=<%= pubmirrordir %> diff --git a/modules/mirror/templates/mirrordir b/modules/mirror/templates/mirrordir index 9cf09650..b8bf9fb6 100644 --- a/modules/mirror/templates/mirrordir +++ b/modules/mirror/templates/mirrordir @@ -1,9 +1,9 @@ #!/bin/sh -remoteurl="<%= @remoteurl%>" -localdir="<%= @localdir %>" -rsync_options="<%= @rsync_options %>" -lockfile="<%= @lockfile %>" +remoteurl="<%= remoteurl%>" +localdir="<%= localdir %>" +rsync_options="<%= rsync_options %>" +lockfile="<%= lockfile %>" if [ -f "$lockfile" ]; then # show error message when run from command line diff --git a/modules/mirrorbrain/templates/mirrorbrain.conf b/modules/mirrorbrain/templates/mirrorbrain.conf index 94bef340..9f7002d1 100644 --- a/modules/mirrorbrain/templates/mirrorbrain.conf +++ b/modules/mirrorbrain/templates/mirrorbrain.conf @@ -3,9 +3,9 @@ instances = main [main] dbuser = mirrorbrain -dbpass = <%= @mb_pgsql_pw %> +dbpass = <%= mb_pgsql_pw %> dbdriver = postgresql -dbhost = pgsql.<%= @domain %> +dbhost = pgsql.<%= domain %> # optional: dbport = ... dbname = mirrorbrain diff --git a/modules/openldap/templates/init_ldap.sh b/modules/openldap/templates/init_ldap.sh index 01ab00bb..dfcaf236 100644 --- a/modules/openldap/templates/init_ldap.sh +++ b/modules/openldap/templates/init_ldap.sh @@ -1,27 +1,27 @@ #!/bin/bash ldapadd -Y EXTERNAL -H ldapi:/// <<EOF -dn: <%= @dc_suffix %> -dc: <%= @dc_suffix.split(',')[0].split('=')[1] %> +dn: <%= dc_suffix %> +dc: <%= dc_suffix.split(',')[0].split('=')[1] %> objectClass: domain objectClass: domainRelatedObject -associatedDomain: <%= @domain %> +associatedDomain: <%= domain %> <% for g in ['People','Group','Hosts'] %> -dn: ou=<%= @g %>,<%= @dc_suffix %> -ou: <%= @g %> +dn: ou=<%= g%>,<%= dc_suffix %> +ou: <%= g %> objectClass: organizationalUnit <% end %> <% gid = 5000 for g in ['packagers','web','sysadmin','packagers-committers','forum-developers'] %> -dn: cn=mga-<%= @g %>,ou=Group,<%= @dc_suffix %> +dn: cn=mga-<%= g %>,ou=Group,<%= dc_suffix %> objectClass: groupOfNames objectClass: posixGroup -cn: mga-<%= @g %> -gidNumber: <%= @gid %> -member: cn=manager,<%= @dc_suffix %> +cn: mga-<%= g %> +gidNumber: <%= gid %> +member: cn=manager,<%= dc_suffix %> <%- gid+=1 end -%> @@ -29,10 +29,10 @@ end -%> <% # FIXME automatically get the list of servers for g in ['duvel','alamut'] %> -dn: cn=<%= @g %>.<%= @domain %>,ou=Hosts,<%= @dc_suffix %> +dn: cn=<%= g%>.<%= domain %>,ou=Hosts,<%= dc_suffix %> objectClass: device objectClass: simpleSecurityObject -cn: <%= @g %>.<%= @domain %> +cn: <%= g%>.<%= domain %> userPassword: x <% end %> diff --git a/modules/openldap/templates/mandriva-dit-access.conf b/modules/openldap/templates/mandriva-dit-access.conf index 8cf2a404..361d956b 100644 --- a/modules/openldap/templates/mandriva-dit-access.conf +++ b/modules/openldap/templates/mandriva-dit-access.conf @@ -1,195 +1,195 @@ # mandriva-dit-access.conf -limits group="cn=LDAP Replicators,ou=System Groups,<%= @dc_suffix %>" +limits group="cn=LDAP Replicators,ou=System Groups,<%= dc_suffix %>" limit size=unlimited limit time=unlimited -limits group="cn=LDAP Admins,ou=System Groups,<%= @dc_suffix %>" +limits group="cn=LDAP Admins,ou=System Groups,<%= dc_suffix %>" limit size=unlimited limit time=unlimited -limits group="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" +limits group="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" limit size=unlimited limit time=unlimited # so we don't have to add these to every other acl down there -access to dn.subtree="<%= @dc_suffix %>" - by group.exact="cn=LDAP Admins,ou=System Groups,<%= @dc_suffix %>" write - by group.exact="cn=LDAP Replicators,ou=System Groups,<%= @dc_suffix %>" read +access to dn.subtree="<%= dc_suffix %>" + by group.exact="cn=LDAP Admins,ou=System Groups,<%= dc_suffix %>" write + by group.exact="cn=LDAP Replicators,ou=System Groups,<%= dc_suffix %>" read by * break # userPassword access # Allow account registration to write userPassword of unprivileged users accounts -access to dn.subtree="ou=People,<%= @dc_suffix %>" +access to dn.subtree="ou=People,<%= dc_suffix %>" filter="(&(objectclass=inetOrgPerson)(!(objectclass=posixAccount)))" attrs=userPassword - by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= @dc_suffix %>" +w + by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" +w by * +0 break # shadowLastChange is here because it needs to be writable by the user because # of pam_ldap, which will update this attr whenever the password is changed. # And this is done with the user's credentials -access to dn.subtree="<%= @dc_suffix %>" +access to dn.subtree="<%= dc_suffix %>" attrs=shadowLastChange by self write - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by users read -access to dn.subtree="<%= @dc_suffix %>" +access to dn.subtree="<%= dc_suffix %>" attrs=userPassword - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by self write by anonymous auth by * none # kerberos key access # "by auth" just in case... -access to dn.subtree="<%= @dc_suffix %>" +access to dn.subtree="<%= dc_suffix %>" attrs=krb5Key by self write - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by anonymous auth by * none # password policies -access to dn.subtree="ou=Password Policies,<%= @dc_suffix %>" - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write +access to dn.subtree="ou=Password Policies,<%= dc_suffix %>" + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by users read # samba password attributes # by self not strictly necessary, because samba uses its own admin user to # change the password on the user's behalf # openldap also doesn't auth on these attributes, but maybe some day it will -access to dn.subtree="<%= @dc_suffix %>" +access to dn.subtree="<%= dc_suffix %>" attrs=sambaLMPassword,sambaNTPassword - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by anonymous auth by self write by * none # password history attribute # pwdHistory is read-only, but ACL is simpler with it here -access to dn.subtree="<%= @dc_suffix %>" +access to dn.subtree="<%= dc_suffix %>" attrs=sambaPasswordHistory,pwdHistory by self read - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by * none # pwdReset, so the admin can force an user to change a password -access to dn.subtree="<%= @dc_suffix %>" +access to dn.subtree="<%= dc_suffix %>" attrs=pwdReset,pwdAccountLockedTime - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by self read # group owner can add/remove/edit members to groups -access to dn.regex="^cn=[^,]+,ou=(System Groups|Group),<%= @dc_suffix %>$" +access to dn.regex="^cn=[^,]+,ou=(System Groups|Group),<%= dc_suffix %>$" attrs=member,owner by dnattr=owner write - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by users +scrx -access to dn.regex="^cn=[^,]+,ou=(System Groups|Group),<%= @dc_suffix %>$" +access to dn.regex="^cn=[^,]+,ou=(System Groups|Group),<%= dc_suffix %>$" attrs=cn,description,objectClass,gidNumber - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by users read # registration - allow registrar group to create basic unprivileged accounts -access to dn.subtree="ou=People,<%= @dc_suffix %>" +access to dn.subtree="ou=People,<%= dc_suffix %>" attrs="objectClass" val="inetOrgperson" - by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= @dc_suffix %>" =asrx + by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" =asrx by * +0 break -access to dn.subtree="ou=People,<%= @dc_suffix %>" +access to dn.subtree="ou=People,<%= dc_suffix %>" filter="(!(objectclass=posixAccount))" attrs=cn,sn,gn,mail,entry,children,preferredLanguage - by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= @dc_suffix %>" =asrx + by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" =asrx by * +0 break # TODO maybe we should use a group instead of a user here -access to dn.subtree="ou=People,<%= @dc_suffix %>" +access to dn.subtree="ou=People,<%= dc_suffix %>" filter="(objectclass=posixAccount)" attrs=homeDirectory,cn,uid,loginShell,gidNumber,uidNumber - by dn.one="ou=Hosts,<%= @dc_suffix %>" read + by dn.one="ou=Hosts,<%= dc_suffix %>" read by * +0 break # let the user change some of his/her attributes -access to dn.subtree="ou=People,<%= @dc_suffix %>" +access to dn.subtree="ou=People,<%= dc_suffix %>" attrs=cn,sn,givenName,carLicense,drink,homePhone,homePostalAddress,mobile,pager,telephoneNumber,mail,preferredLanguage,sshPublicKey by self write by users read -access to dn.subtree="ou=People,<%= @dc_suffix %>" +access to dn.subtree="ou=People,<%= dc_suffix %>" attrs=memberOf by users read # create new accounts -access to dn.regex="^([^,]+,)?ou=(People|Group|Hosts),<%= @dc_suffix %>$" +access to dn.regex="^([^,]+,)?ou=(People|Group|Hosts),<%= dc_suffix %>$" attrs=children,entry - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by * break # access to existing entries -access to dn.regex="^[^,]+,ou=(People|Hosts|Group),<%= @dc_suffix %>$" - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write +access to dn.regex="^[^,]+,ou=(People|Hosts|Group),<%= dc_suffix %>$" + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by * break # sambaDomainName entry -access to dn.regex="^(sambaDomainName=[^,]+,)?<%= @dc_suffix %>$" +access to dn.regex="^(sambaDomainName=[^,]+,)?<%= dc_suffix %>$" attrs=children,entry,@sambaDomain,@sambaUnixIdPool - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write by users read # samba ID mapping -access to dn.regex="^(sambaSID=[^,]+,)?ou=Idmap,<%= @dc_suffix %>$" +access to dn.regex="^(sambaSID=[^,]+,)?ou=Idmap,<%= dc_suffix %>$" attrs=children,entry,@sambaIdmapEntry - by group.exact="cn=Account Admins,ou=System Groups,<%= @dc_suffix %>" write - by group.exact="cn=IDMAP Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Account Admins,ou=System Groups,<%= dc_suffix %>" write + by group.exact="cn=IDMAP Admins,ou=System Groups,<%= dc_suffix %>" write by users read # global address book # XXX - which class(es) to use? -access to dn.regex="^(.*,)?ou=Address Book,<%= @dc_suffix %>" +access to dn.regex="^(.*,)?ou=Address Book,<%= dc_suffix %>" attrs=children,entry,@inetOrgPerson,@evolutionPerson,@evolutionPersonList - by group.exact="cn=Address Book Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Address Book Admins,ou=System Groups,<%= dc_suffix %>" write by users read # dhcp entries # XXX - open up read access to anybody? -access to dn.sub="ou=dhcp,<%= @dc_suffix %>" +access to dn.sub="ou=dhcp,<%= dc_suffix %>" attrs=children,entry,@dhcpService,@dhcpServer,@dhcpSharedNetwork,@dhcpSubnet,@dhcpPool,@dhcpGroup,@dhcpHost,@dhcpClass,@dhcpSubClass,@dhcpOptions,@dhcpLeases,@dhcpLog - by group.exact="cn=DHCP Admins,ou=System Groups,<%= @dc_suffix %>" write - by group.exact="cn=DHCP Readers,ou=System Groups,<%= @dc_suffix %>" read + by group.exact="cn=DHCP Admins,ou=System Groups,<%= dc_suffix %>" write + by group.exact="cn=DHCP Readers,ou=System Groups,<%= dc_suffix %>" read by * read # sudoers -access to dn.regex="^([^,]+,)?ou=sudoers,<%= @dc_suffix %>$" +access to dn.regex="^([^,]+,)?ou=sudoers,<%= dc_suffix %>$" attrs=children,entry,@sudoRole - by group.exact="cn=Sudo Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=Sudo Admins,ou=System Groups,<%= dc_suffix %>" write by users read # dns -access to dn="ou=dns,<%= @dc_suffix %>" +access to dn="ou=dns,<%= dc_suffix %>" attrs=entry,@extensibleObject - by group.exact="cn=DNS Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=DNS Admins,ou=System Groups,<%= dc_suffix %>" write by users read -access to dn.sub="ou=dns,<%= @dc_suffix %>" +access to dn.sub="ou=dns,<%= dc_suffix %>" attrs=children,entry,@dNSZone - by group.exact="cn=DNS Admins,ou=System Groups,<%= @dc_suffix %>" write - by group.exact="cn=DNS Readers,ou=System Groups,<%= @dc_suffix %>" read + by group.exact="cn=DNS Admins,ou=System Groups,<%= dc_suffix %>" write + by group.exact="cn=DNS Readers,ou=System Groups,<%= dc_suffix %>" read by * none # MTA # XXX - what else can we add here? Virtual Domains? With which schema? -access to dn.one="ou=People,<%= @dc_suffix %>" +access to dn.one="ou=People,<%= dc_suffix %>" attrs=@inetLocalMailRecipient,mail - by group.exact="cn=MTA Admins,ou=System Groups,<%= @dc_suffix %>" write + by group.exact="cn=MTA Admins,ou=System Groups,<%= dc_suffix %>" write by users read # KDE Configuration -access to dn.sub="ou=KDEConfig,<%= @dc_suffix %>" - by group.exact="cn=KDEConfig Admins,ou=System Groups,<%= @dc_suffix %>" write +access to dn.sub="ou=KDEConfig,<%= dc_suffix %>" + by group.exact="cn=KDEConfig Admins,ou=System Groups,<%= dc_suffix %>" write by * read # last one -access to dn.subtree="<%= @dc_suffix %>" attrs=entry,uid,cn +access to dn.subtree="<%= dc_suffix %>" attrs=entry,uid,cn by users read diff --git a/modules/openldap/templates/slapd.conf b/modules/openldap/templates/slapd.conf index 542e54fa..d82fe088 100644 --- a/modules/openldap/templates/slapd.conf +++ b/modules/openldap/templates/slapd.conf @@ -29,7 +29,7 @@ include /usr/share/openldap/schema/openssh-lpk_openldap.schema pidfile /var/run/ldap/slapd.pid argsfile /var/run/ldap/slapd.args -modulepath <%= @lib_dir %>/openldap +modulepath <%= lib_dir %>/openldap <% if @hostname == 'duvel' then %> moduleload back_bdb.la <% else %> @@ -44,9 +44,9 @@ moduleload unique.la moduleload dynlist.la moduleload constraint.la -TLSCertificateFile /etc/ssl/openldap/ldap.<%= @domain %>.pem -TLSCertificateKeyFile /etc/ssl/openldap/ldap.<%= @domain %>.pem -TLSCACertificateFile /etc/ssl/openldap/ldap.<%= @domain %>.pem +TLSCertificateFile /etc/ssl/openldap/ldap.<%= domain %>.pem +TLSCertificateKeyFile /etc/ssl/openldap/ldap.<%= domain %>.pem +TLSCACertificateFile /etc/ssl/openldap/ldap.<%= domain %>.pem # Give ldapi connection some security localSSF 56 @@ -60,8 +60,8 @@ loglevel 256 database monitor access to dn.subtree="cn=Monitor" - by group.exact="cn=LDAP Monitors,ou=System Groups,<%= @dc_suffix %>" read - by group.exact="cn=LDAP Admins,ou=System Groups,<%= @dc_suffix %>" read + by group.exact="cn=LDAP Monitors,ou=System Groups,<%= dc_suffix %>" read + by group.exact="cn=LDAP Admins,ou=System Groups,<%= dc_suffix %>" read by * none <% if @hostname == 'duvel' then %> @@ -71,9 +71,9 @@ database mdb # mdb defaults to 10MB max DB, so we need to hardcode some better value :( maxsize 500000000 <% end %> -suffix "<%= @dc_suffix %>" +suffix "<%= dc_suffix %>" directory /var/lib/ldap -rootdn "cn=manager,<%= @dc_suffix %>" +rootdn "cn=manager,<%= dc_suffix %>" checkpoint 256 5 <% if @hostname == 'duvel' then %> @@ -105,7 +105,7 @@ syncprov-checkpoint 100 10 syncprov-sessionlog 100 overlay ppolicy -ppolicy_default "cn=default,ou=Password Policies,<%= @dc_suffix %>" +ppolicy_default "cn=default,ou=Password Policies,<%= dc_suffix %>" ppolicy_hash_cleartext yes ppolicy_use_lockout yes @@ -128,8 +128,8 @@ constraint_attribute sshPublicKey regex "^ssh-(rsa|dss|ed25519) [[:graph:]]+ [[: <% 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 %> + "cn=manager,<%= dc_suffix %>" +authz-regexp ^uid=([^,]+),cn=[^,]+,cn=auth$ uid=$1,ou=People,<%= dc_suffix %> <% end %> include /etc/openldap/mandriva-dit-access.conf diff --git a/modules/openldap/templates/slapd.syncrepl.conf b/modules/openldap/templates/slapd.syncrepl.conf index 4c69a56e..2bfe7d50 100644 --- a/modules/openldap/templates/slapd.syncrepl.conf +++ b/modules/openldap/templates/slapd.syncrepl.conf @@ -1,11 +1,11 @@ -syncrepl rid=<%= @rid %> - provider=ldaps://ldap-master.<%= @domain %>:636 +syncrepl rid=<%= rid %> + provider=ldaps://ldap-master.<%= domain %>:636 type=refreshAndPersist - searchbase="<%= @dc_suffix %>" + searchbase="<%= dc_suffix %>" schemachecking=off bindmethod=simple - binddn="cn=syncuser-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>" - credentials=<%= @sync_password %> + binddn="cn=syncuser-<%= hostname%>,ou=System Accounts,<%= dc_suffix %>" + credentials=<%= sync_password %> tls_reqcert=never -updateref ldaps://ldap-master.<%= @domain %>:636 +updateref ldaps://ldap-master.<%= domain %>:636 diff --git a/modules/openldap/templates/slapd.test.conf b/modules/openldap/templates/slapd.test.conf index a492acd7..8befa55a 100644 --- a/modules/openldap/templates/slapd.test.conf +++ b/modules/openldap/templates/slapd.test.conf @@ -2,7 +2,7 @@ database bdb suffix "dc=test_ldap" directory /var/lib/ldap/test rootdn "cn=manager,dc=test_ldap" -rootpw "<%= @ldap_test_password %>" +rootpw "<%= ldap_test_password %>" authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth" "cn=manager,dc=test_ldap" # force ssl diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py index e59545b3..6718b053 100755 --- a/modules/openssh/templates/ldap-sshkey2file.py +++ b/modules/openssh/templates/ldap-sshkey2file.py @@ -15,18 +15,18 @@ except ImportError: print("Please install python-ldap before running this program") sys.exit(1) -basedn = "<%= @dc_suffix %>" +basedn = "<%= dc_suffix %>" peopledn = f"ou=people,{basedn}" <%- ldap_servers.map! { |l| "'ldaps://#{l}'" } -%> -uris = [<%= @ldap_servers.join(", ") %>] +uris = [<%= ldap_servers.join(", ") %>] random.shuffle(uris) uri = " ".join(uris) timeout = 5 -binddn = f"cn=<%= @fqdn %>,ou=Hosts,{basedn}" -ldap_secret_file = "<%= @ldap_pwfile %>" -nslcd_conf_file = "<%= @nslcd_conf_file %>" +binddn = f"cn=<%= fqdn %>,ou=Hosts,{basedn}" +ldap_secret_file = "<%= ldap_pwfile %>" +nslcd_conf_file = "<%= nslcd_conf_file %>" # filter out disabled accounts also # too bad uidNumber doesn't support >= filters objfilter = "(&(objectClass=inetOrgPerson)(objectClass=ldapPublicKey)(objectClass=posixAccount)(sshPublicKey=*))" diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config index 31a9e1f7..43c3f9c5 100644 --- a/modules/openssh/templates/sshd_config +++ b/modules/openssh/templates/sshd_config @@ -124,7 +124,7 @@ UsePrivilegeSeparation yes # override default of no subsystems <% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> -Subsystem sftp <%= @path_to_sftp %>/sftp-server +Subsystem sftp <%= path_to_sftp %>/sftp-server <% else %> Subsystem sftp /usr/libexec/openssh/sftp-server <% end %> diff --git a/modules/pam/templates/ldap.conf b/modules/pam/templates/ldap.conf index 0e8495df..235a6aac 100644 --- a/modules/pam/templates/ldap.conf +++ b/modules/pam/templates/ldap.conf @@ -1,18 +1,18 @@ -rootbinddn cn=<%= @fqdn %>,ou=Hosts,<%= @dc_suffix %> +rootbinddn cn=<%= fqdn %>,ou=Hosts,<%= dc_suffix %> -uri ldaps://ldap.<%= @domain %> -base <%= @dc_suffix %> +uri ldaps://ldap.<%= domain %> +base <%= dc_suffix %> timelimit 4 bind_timelimit 4 pam_lookup_policy yes pam_password exop -nss_base_passwd ou=People,<%= @dc_suffix %>?one -nss_base_shadow ou=People,<%= @dc_suffix %>?one -nss_base_group ou=Group,<%= @dc_suffix %>?one +nss_base_passwd ou=People,<%= dc_suffix %>?one +nss_base_shadow ou=People,<%= dc_suffix %>?one +nss_base_group ou=Group,<%= dc_suffix %>?one nss_schema rfc2307bis nss_map_attribute uniqueMember member -sudoers_base ou=sudoers,<%= @dc_suffix %> +sudoers_base ou=sudoers,<%= dc_suffix %> #sudoers_debug 2 <%- diff --git a/modules/pam/templates/openldap.ldap.conf b/modules/pam/templates/openldap.ldap.conf index a2a3efab..cd6ee640 100644 --- a/modules/pam/templates/openldap.ldap.conf +++ b/modules/pam/templates/openldap.ldap.conf @@ -18,7 +18,7 @@ TLS_REQCERT allow # Use the default self-signed cert generated by openldap-server postinstall # by default #TLS_CACERT /etc/pki/tls/certs/ldap.pem -#TLS_CACERT /etc/ssl/openldap/ldap.<%= @domain %>.pem +#TLS_CACERT /etc/ssl/openldap/ldap.<%= domain %>.pem # If requiring support for certificates signed by all CAs (noting risks # pam_ldap if doing DNS-based suffix lookup etc. diff --git a/modules/pam/templates/system-auth b/modules/pam/templates/system-auth index c6496ba8..37d1da7d 100644 --- a/modules/pam/templates/system-auth +++ b/modules/pam/templates/system-auth @@ -14,7 +14,7 @@ account required pam_ldap.so <%- allowed_access_classes = scope.lookupvar('pam::multiple_ldap_access::allowed_access_classes') -%> <%- if allowed_access_classes -%> <%- allowed_access_classes.each { |ldap_group| -%> -account sufficient pam_succeed_if.so quiet user ingroup <%= @ldap_group %> +account sufficient pam_succeed_if.so quiet user ingroup <%= ldap_group %> <%- } -%> <%- end -%> account required pam_deny.so diff --git a/modules/phpbb/templates/config.php b/modules/phpbb/templates/config.php index a713adda..5d878235 100644 --- a/modules/phpbb/templates/config.php +++ b/modules/phpbb/templates/config.php @@ -2,11 +2,11 @@ // phpBB 3.0.x auto-generated configuration file // // Do not change anything in this file! $dbms = 'postgres'; -$dbhost = 'pg.<%= @domain %>'; +$dbhost = 'pg.<%= domain %>'; $dbport = ''; -$dbname = '<%= @database %>'; -$dbuser = '<%= @user %>'; -$dbpasswd = '<%= @pgsql_password %>'; +$dbname = '<%= database %>'; +$dbuser = '<%= user %>'; +$dbpasswd = '<%= pgsql_password %>'; $table_prefix = 'phpbb_'; $acm_type = 'apc'; $load_extensions = ''; diff --git a/modules/phpbb/templates/forums_redirect.conf b/modules/phpbb/templates/forums_redirect.conf index 0dcfec53..24747b4c 100644 --- a/modules/phpbb/templates/forums_redirect.conf +++ b/modules/phpbb/templates/forums_redirect.conf @@ -1,2 +1,2 @@ -Redirect /<%= @lang %> <%= @url %> -Redirect /<%= @lang %>/ <%= @url %> +Redirect /<%= lang %> <%= url %> +Redirect /<%= lang %>/ <%= url %> diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf index ea0963dd..d60e65ab 100644 --- a/modules/phpbb/templates/forums_vhost.conf +++ b/modules/phpbb/templates/forums_vhost.conf @@ -13,9 +13,9 @@ RewriteRule ^/$ /en/ [R] RewriteRule ^/(..)$ /$1/ [R] - AliasMatch ^/(..)/(.*) <%= @forums_dir %>/$1/phpBB/$2 + AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2 - <Directory ~ "<%= @forums_dir %>/.*/phpBB/"> + <Directory ~ "<%= forums_dir %>/.*/phpBB/"> <IfModule mod_authz_core.c> # Apache 2.4 Require all granted @@ -45,7 +45,7 @@ forbidden = ['install', ] for f in forbidden -%> - <Directory <%= @forums_dir %>/.*/phpBB/<%= @f %>/ > + <Directory <%= forums_dir %>/.*/phpBB/<%= f %>/ > <IfModule mod_authz_core.c> # Apache 2.4 Require all denied diff --git a/modules/planet/templates/backup_planet-files.sh b/modules/planet/templates/backup_planet-files.sh index 47916370..8cab8d1e 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 41557fcc..b3889d31 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 652a69e7..b3a07ab9 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 a230a070..eac16dab 100644 --- a/modules/postfix/templates/group_aliases.conf +++ b/modules/postfix/templates/group_aliases.conf @@ -1,15 +1,15 @@ <%- ldap = ldap_servers.map { |l| "ldaps://#{l}:636" } -%> -server_host = <%= @ldap.join(' ') %> -search_base = <%= @dc_suffix %> +server_host = <%= ldap.join(' ') %> +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 232cf02e..40d7da13 100644 --- a/modules/postfix/templates/ldap_aliases.conf +++ b/modules/postfix/templates/ldap_aliases.conf @@ -7,14 +7,14 @@ end ldap = ldap_servers.map { |l| "ldaps://#{l}:636" } -%> -server_host = <%= @ldap.join(' ') %> -search_base = <%= @dc_suffix %> -query_filter = (&(uid=%u)(|<%= @query_string %>)) +server_host = <%= ldap.join(' ') %> +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 9fe072b2..7fe0f073 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,21 +40,21 @@ smtp_address_preference = ipv4 # FIXME Do not hardcode this mynetworks = 212.85.158.144/28 [2a02:2178:2:7::]/64 127.0.0.1 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 %> - ml.<%= @domain %> +mydestination = <%= fqdn %> + ml.<%= domain %> <%- 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 = @@ -98,7 +98,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 331166c2..e0c116a7 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 63650c84..436e7a28 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/transport_regexp b/modules/postfix/templates/transport_regexp index 941b77df..3eb5494f 100644 --- a/modules/postfix/templates/transport_regexp +++ b/modules/postfix/templates/transport_regexp @@ -2,9 +2,9 @@ ml_domain = 'ml\.' + domain.gsub('.','\.') %> <%- if classes.include?('sympa::server') -%> -/^.*+owner\@<%= @ml_domain %>$/ sympabounce: -/^bounce+.*\@<%= @ml_domain %>$/ sympabounce: -/^.*\@<%= @ml_domain %>$/ sympa: +/^.*+owner\@<%= ml_domain %>$/ sympabounce: +/^bounce+.*\@<%= ml_domain %>$/ sympabounce: +/^.*\@<%= ml_domain %>$/ sympa: <%- else -%> -/^.*\@<%= @ml_domain %>$/ smtp:sucuk.mageia.org +/^.*\@<%= ml_domain %>$/ smtp:sucuk.mageia.org <%- end -%> diff --git a/modules/postfix/templates/virtual_aliases b/modules/postfix/templates/virtual_aliases index a3c9d125..861e79c6 100644 --- a/modules/postfix/templates/virtual_aliases +++ b/modules/postfix/templates/virtual_aliases @@ -1,32 +1,32 @@ # do not forget to add $domain or it will not work # do not hardcode the domain, or it will be harvested by bot -treasurer@<%= @domain %> treasurer@group.<%= @domain %> -president@<%= @domain %> ennael@<%= @domain %> -secretary@<%= @domain %> obgr_seneca@<%= @domain %> +treasurer@<%= domain %> treasurer@group.<%= domain %> +president@<%= domain %> ennael@<%= domain %> +secretary@<%= domain %> obgr_seneca@<%= 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 a1da9c10..e4232a4e 100644 --- a/modules/postgresql/templates/pg_hba.conf +++ b/modules/postgresql/templates/pg_hba.conf @@ -79,7 +79,7 @@ <%- for line in @conf_lines -%> -<%= @line %> +<%= line %> <%- end -%> @@ -92,10 +92,10 @@ # fetch it 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 %> 2a02:2178:2:7::2/128 md5 +host <%= i %> <%= i %> 127.0.0.1/32 md5 +host <%= i %> <%= i %> ::1/128 md5 +hostssl <%= i %> <%= i %> <%= ipaddress %>/32 md5 +hostssl <%= i %> <%= i %> 2a02:2178:2:7::2/128 md5 <% end %> @@ -104,12 +104,12 @@ end lang = ['en','de'] 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 2a02:2178:2:7::2/128 md5 +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 2a02:2178:2:7::2/128 md5 # temporary, for the forum on friteuse vm -hostssl phpbb_<%= @l %> phpbb 192.168.122.0/24 md5 +hostssl phpbb_<%= l %> phpbb 192.168.122.0/24 md5 <% end %> diff --git a/modules/postgrey/templates/whitelist_clients.local b/modules/postgrey/templates/whitelist_clients.local index a2118a54..8c87b88c 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 f0e4388c..89157fc2 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 b3fc037d..aba07857 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 1b906274..337a5043 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 bc9f762d..44dfedb7 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 @@ -12,7 +12,7 @@ graph = true <% if environment %> - environment = <%= @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.conf b/modules/puppet/templates/puppet.conf index e2fb9357..28e8c363 100644 --- a/modules/puppet/templates/puppet.conf +++ b/modules/puppet/templates/puppet.conf @@ -18,4 +18,4 @@ modulepath = $confdir/modules:$confdir/deployment:$confdir/external:/usr/share/puppet/modules queue_type = stomp queue_source = stomp://localhost:61613 -<%= @db_config %> +<%= db_config %> diff --git a/modules/puppet/templates/puppet.master.conf b/modules/puppet/templates/puppet.master.conf index 561e4e41..0180fc2a 100644 --- a/modules/puppet/templates/puppet.master.conf +++ b/modules/puppet/templates/puppet.master.conf @@ -1,14 +1,14 @@ <% 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 storeconfigs = true async_storeconfigs = true -<%= @db_config %> +<%= db_config %> diff --git a/modules/puppet/templates/tagmail.conf b/modules/puppet/templates/tagmail.conf index bda12256..96b034aa 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 e484a88e..43ca9e1b 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/rsnapshot/templates/rsnapshot.conf b/modules/rsnapshot/templates/rsnapshot.conf index f8d97018..2ec5edcf 100644 --- a/modules/rsnapshot/templates/rsnapshot.conf +++ b/modules/rsnapshot/templates/rsnapshot.conf @@ -24,7 +24,7 @@ config_version 1.2 # All snapshots will be stored under this root directory. # -snapshot_root <%= @snapshot_root %> +snapshot_root <%= snapshot_root %> # If no_create_root is enabled, rsnapshot will not automatically create the # snapshot_root directory. This is particularly useful if you are backing @@ -201,9 +201,9 @@ link_dest 1 ############################### <%- for b in @backup -%> -<%= @b.split().unshift("backup").join("\t") %> +<%= b.split().unshift("backup").join("\t") %> <%- end -%> <%- for bs in @backup_script -%> -<%= @bs.split().unshift("backup_script").join("\t") %> +<%= bs.split().unshift("backup_script").join("\t") %> <%- end -%> diff --git a/modules/ssmtp/templates/ssmtp.conf b/modules/ssmtp/templates/ssmtp.conf index d7a9125f..b535bc29 100644 --- a/modules/ssmtp/templates/ssmtp.conf +++ b/modules/ssmtp/templates/ssmtp.conf @@ -1,9 +1,9 @@ -root=mageia-sysadm@<%= @domain %> +root=mageia-sysadm@<%= domain %> -mailhub=mx.<%= @domain %> +mailhub=mx.<%= domain %> rewriteDomain= # The full hostname -hostname=<%= @fqdn %> +hostname=<%= fqdn %> diff --git a/modules/subversion/templates/hook_extract.pl b/modules/subversion/templates/hook_extract.pl index 2260b014..bf1fc545 100644 --- a/modules/subversion/templates/hook_extract.pl +++ b/modules/subversion/templates/hook_extract.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -MSVN::Notify::Config=$0 --- #YAML:1.0 <%- extract_dir.each do |src,dest| -%> -'<%= @src %>': +'<%= src %>': PATH: "/usr/bin:/usr/local/bin" handler: Mirror svn-binary: /usr/bin/svn - to: <%= @dest %> + to: <%= dest %> <%- end -%> diff --git a/modules/subversion/templates/hook_irker b/modules/subversion/templates/hook_irker index 8f6ea431..8fd7a874 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 9f0b61a4..81b786d2 100644 --- a/modules/subversion/templates/hook_sendmail.pl +++ b/modules/subversion/templates/hook_sendmail.pl @@ -14,7 +14,7 @@ from: subversion_noreply@ml.<%= @domain %> to: <%- commit_mail.each do |mail| -%> - - <%= @mail %> + - <%= mail %> <%- end -%> <%- if i18n_mail != '' -%> '.*\.pot$': @@ -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/irker.conf b/modules/subversion/templates/irker.conf index 0b6a8824..d037a120 100644 --- a/modules/subversion/templates/irker.conf +++ b/modules/subversion/templates/irker.conf @@ -4,4 +4,4 @@ content += key + ' = ' + @irker_conf[key] + "\n" } -%> -<%= @content %> +<%= content %> diff --git a/modules/subversion/templates/restricted_to_user b/modules/subversion/templates/restricted_to_user index fcdfa38c..98297627 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 76141e54..3960cdab 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 c0eaab2a..0919ae60 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 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 diff --git a/modules/transifex/templates/20-engines.conf b/modules/transifex/templates/20-engines.conf index 620a9556..6523dfd4 100644 --- a/modules/transifex/templates/20-engines.conf +++ b/modules/transifex/templates/20-engines.conf @@ -9,8 +9,8 @@ DATABASE_ENGINE = 'postgresql_psycopg2' DATABASE_NAME = 'transifex' # The following are not used for sqlite3 DATABASE_USER = 'transifex' -DATABASE_PASSWORD = '<%= @pgsql_password %>' -DATABASE_HOST = 'pgsql.<%= @domain %>' # Set to empty string for local socket +DATABASE_PASSWORD = '<%= pgsql_password %>' +DATABASE_HOST = 'pgsql.<%= domain %>' # Set to empty string for local socket DATABASE_PORT = '' # Set to empty string for default ## Caching (optional) diff --git a/modules/transifex/templates/30-site.conf b/modules/transifex/templates/30-site.conf index 3c386354..4d4e9e4c 100644 --- a/modules/transifex/templates/30-site.conf +++ b/modules/transifex/templates/30-site.conf @@ -1,7 +1,7 @@ # Sites SITE_ID = 1 # Your site's domain. This is used only in this file. -SITE_DOMAIN = '<%= @domain %>' +SITE_DOMAIN = '<%= domain %>' ADMINS = ( # ('Your Name', 'your_email@domain.com'), diff --git a/modules/transifex/templates/45-ldap.conf b/modules/transifex/templates/45-ldap.conf index 2532edf5..dd215dc9 100644 --- a/modules/transifex/templates/45-ldap.conf +++ b/modules/transifex/templates/45-ldap.conf @@ -17,16 +17,16 @@ from django_auth_ldap.config import LDAPSearch, GroupOfNamesType # Baseline configuration. -AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= @domain %> ldap://ldap-slave-1.<%= @domain %>" +AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= domain %> ldap://ldap-slave-1.<%= domain %>" -AUTH_LDAP_BIND_DN = "cn=transifex-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>" -AUTH_LDAP_BIND_PASSWORD = "<%= @ldap_password %>" +AUTH_LDAP_BIND_DN = "cn=transifex-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>" +AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>" -AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= @dc_suffix %> ", +AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ", ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))") # Set up the basic group parameters. -AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= @dc_suffix %>", +AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>", ldap.SCOPE_SUBTREE, "(objectClass=groupOfNames)" ) AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn") @@ -42,7 +42,7 @@ AUTH_LDAP_USER_ATTR_MAP = { } AUTH_LDAP_USER_FLAGS_BY_GROUP = { - "is_active": "cn=mga-i18n,ou=Group,<%= @dc_suffix %>", - "is_staff": "cn=mga-i18n-committers,ou=Group,<%= @dc_suffix %>", - "is_superuser": "cn=mga-sysadmin,ou=Group,<%= @dc_suffix %>" + "is_active": "cn=mga-i18n,ou=Group,<%= dc_suffix %>", + "is_staff": "cn=mga-i18n-committers,ou=Group,<%= dc_suffix %>", + "is_superuser": "cn=mga-sysadmin,ou=Group,<%= dc_suffix %>" } diff --git a/modules/transifex/templates/50-project.conf b/modules/transifex/templates/50-project.conf index 013741b2..17281d9a 100644 --- a/modules/transifex/templates/50-project.conf +++ b/modules/transifex/templates/50-project.conf @@ -40,7 +40,7 @@ MIDDLEWARE_CLASSES = [ ROOT_URLCONF = 'urls' TEMPLATE_DIRS = [ - '<%= @templates_dir %>', + '<%= templates_dir %>', os.path.join(TX_ROOT, 'templates'), ] diff --git a/modules/xinetd/templates/port_forward b/modules/xinetd/templates/port_forward index 7138dba2..1b76b0e1 100644 --- a/modules/xinetd/templates/port_forward +++ b/modules/xinetd/templates/port_forward @@ -1,4 +1,4 @@ -service <%= @name %> +service <%= name %> { disable = no type = UNLISTED @@ -7,9 +7,9 @@ service <%= @name %> <%- else -%> socket_type = dgram <%- end -%> - protocol = <%= @proto %> + protocol = <%= proto %> user = nobody wait = no - redirect = <%= @target_ip %> <%= @target_port %> - port = <%= @port %> + redirect = <%= target_ip %> <%= target_port %> + port = <%= port %> } diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 372d0fcc..7a3489dc 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -13,34 +13,34 @@ # You need to define at least the Xymon server itself here. page visible Visible Services -0.0.0.0 blog.<%= @domain %> # http://blog.<%= @domain %> -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 %> # http://www.<%= @domain %> -0.0.0.0 svnweb.<%= @domain %> # http://svnweb.<%= @domain %> -0.0.0.0 epoll.<%= @domain %> # https://epoll.<%= @domain %> -0.0.0.0 planet.<%= @domain %> # http://planet.<%= @domain %> +0.0.0.0 blog.<%= domain %> # http://blog.<%= domain %> +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 %> # http://www.<%= domain %> +0.0.0.0 svnweb.<%= domain %> # http://svnweb.<%= domain %> +0.0.0.0 epoll.<%= domain %> # https://epoll.<%= domain %> +0.0.0.0 planet.<%= domain %> # http://planet.<%= domain %> # 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 %> # http://check.<%= @domain %> -0.0.0.0 pkgsubmit.<%= @domain %> # http://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 %> # http://meetbot.<%= @domain %> +0.0.0.0 forums.<%= domain %> # sni https://forums.<%= domain %>=<%= @nodes_ipaddr['sucuk']['ipv4'] %>/ +0.0.0.0 check.<%= domain %> # http://check.<%= domain %> +0.0.0.0 pkgsubmit.<%= domain %> # http://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 %> # http://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.150 fiona.<%= @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.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.150 fiona.<%= domain %> # testip ssh +212.85.158.152 rabbit.<%= domain %> # testip ssh +212.85.158.153 duvel.<%= domain %> # testip ssh rsync svn git ldapssl ldap 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 Scaleway 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg index 1eb8b544..763e253d 100644 --- a/modules/xymon/templates/hobbit-alerts.cfg +++ b/modules/xymon/templates/hobbit-alerts.cfg @@ -121,8 +121,8 @@ 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 +HOST=<%= builders %> SERVICE=cpu + 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 2acf94fe..ff010681 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 f2da8a6a..a5a7aacf 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 84dbfad1..ae54b2f3 100644 --- a/modules/xymon/templates/xymon-client +++ b/modules/xymon/templates/xymon-client @@ -11,9 +11,9 @@ # HOBBITSERVERS="10.0.0.1 192.168.1.1" <% if scope.function_versioncmp([lsbdistrelease, '5']) >= 0 %> -XYMONSERVERS="<%= @server %>" +XYMONSERVERS="<%= server %>" <% else %> -HOBBITSERVERS="<%= @server %>" +HOBBITSERVERS="<%= server %>" <% end %> # The defaults usually suffice for the rest of this file, diff --git a/modules/youri-check/templates/9.conf b/modules/youri-check/templates/9.conf index c2a97970..28028080 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 5774423e..651da40c 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 @@ -278,7 +278,7 @@ tests: age: class: Youri::Check::Test::Age options: - max: <%= @max_days %> days + max: <%= max_days %> days pattern: "%d days" # reports definitions @@ -286,7 +286,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 c3edca69..2cf598b5 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 |