stack.erp5: Drop unneeded executable permissions.

stack/erp5/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 79109ae720d5471cb2dd15e63fdf4dcf
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 9312af2f9d9faf06d2f26f073ad60180
+md5sum = 22270cd739fe00c45d0605dfb7edd2eb
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -47,7 +47,7 @@ md5sum = 6465212fdc7fe9076a0c929d9f14da14
 
 [template-create-erp5-site]
 filename = instance-create-erp5-site.cfg.in
-md5sum = 71cef1d06065951ab4cf43eb13f311a3
+md5sum = 1186c5804bdc679d8a31ac70cd85d51f
 
 [template-create-erp5-site-real]
 filename = instance-create-erp5-site-real.cfg.in
@@ -55,7 +55,7 @@ md5sum = 79f789360e71146486c82a7a10834bae
 
 [template-postfix]
 filename = instance-postfix.cfg.in
-md5sum = 90a017581116f14014a039d38ef36ffd
+md5sum = 2fd9ec619456fd00e7482cebc5c41f76
 
 [template-postfix-master-cf]
 filename = postfix_master.cf.in
@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
 
 [template]
 filename = instance.cfg.in
-md5sum = ec143441fac42ce6b3a183724298bc6b
+md5sum = 9d6c7b1a17cf2a5987e8c9f4c9239736
 
 [monitor-template-dummy]
 filename = dummy.cfg
@@ -87,11 +87,11 @@ md5sum = 84aba4fa10d3087fbcc1d979df90fab9
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = e65672c423d603e5fa516ad811cc1fa9
+md5sum = 3a029d0d94e4f60395b8b202f5422e91
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 049d4153990374dc130403c04accaf13
+md5sum = aa2092e478131d7c6d55fa9d12b6b0f2
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -16,8 +16,12 @@ per partition. No more (undefined result), no less (IndexError).
 {%   do apache_ip_list.append('[' ~ ipv6 ~ ']') -%}
 {% endif -%}
 
-[simplefile]
+[jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
+mode = 644
+
+[simplefile]
+< = jinja2-template-base
 template = inline:{{ '{{ content }}' }}
 
 {% macro simplefile(section_name, file_path, content, mode='') -%}
@@ -95,7 +99,7 @@ backend-dict = {{ dumps(haproxy_dict) }}
 ip = {{ ipv4 }}
 
 [haproxy-cfg]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 template = {{ parameter_dict['template-haproxy-cfg'] }}
 rendered = ${directory:etc}/haproxy.cfg
 context = section parameter_dict haproxy-cfg-parameter-dict
@@ -132,7 +136,7 @@ ca-cert = ${apache-ssl-client:cert}
 crl = ${apache-ssl-client:crl}
 
 [apache-conf]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 template = {{ parameter_dict['template-apache-conf'] }}
 rendered = ${directory:apache-conf}/apache.conf
 context = section parameter_dict apache-conf-parameter-dict

stack/erp5/instance-create-erp5-site.cfg.in

@@ -14,6 +14,7 @@ recipe = slapos.recipe.template:jinja2
 template = {{ parameter_dict['template-create-erp5-site-real'] }}
 rendered = ${buildout:directory}/instance-create-erp5-site-real.cfg
 extensions = jinja2.ext.do
+mode = 644
 context =
   import urlparse urlparse
   section publish publish

stack/erp5/instance-mariadb.cfg.in

@@ -33,8 +33,16 @@ recipe = slapos.cookbook:publish.serialised
 database-list = {{ render_database_list(database_list) }}
 test-database-list = {{ render_database_list(test_database_list) }}
 
-[simplefile]
+[jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
+mode = 644
+
+[jinja2-template-executable]
+< = jinja2-template-base
+mode = 755
+
+[simplefile]
+< = jinja2-template-base
 template = inline:{{ '{{ content }}' }}
 
 {% macro simplefile(section_name, file_path, content, mode='') -%}
@@ -124,7 +132,7 @@ ssl-{{ key }} = {{ value }}
 {% endfor %}
 
 [my-cnf]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc}/mariadb.cnf
 template = {{ parameter_dict['template-my-cnf'] }}
 context = section parameter_dict my-cnf-parameters
@@ -133,7 +141,7 @@ context = section parameter_dict my-cnf-parameters
 database-list = {{ dumps(database_list + test_database_list) }}
 
 [init-script]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-executable
 # XXX: is there a better location ?
 rendered = ${directory:etc}/mariadb_initial_setup.sql
 template = {{ parameter_dict['template-mariadb-initial-setup'] }}

stack/erp5/instance-postfix.cfg.in

@@ -13,6 +13,10 @@
 {% set smtpd_sasl_user = slapparameter_dict['smtpd-sasl-user'] -%}
 {% set smtpd_sasl_password = slapparameter_dict['smtpd-sasl-password'] -%}
 
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+mode = 644
+
 [smtpd-password]
 recipe = slapos.cookbook:generate.password
 storage-path =
@@ -64,7 +68,7 @@ cyrus-sasldb = ${directory:etc-cyrus}/postfix.gdbm
 recipe = slapos.cookbook:userinfo
 
 [smtp-sasl-passwd]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc-postfix}/sasl_passwd
 {% if relay -%}
 template = inline:{{ "{{ host }} {{ sasl_credential }}" }}
@@ -77,7 +81,7 @@ context =
 mode = 600
 
 [{{ section('cyrus-smtpd-conf') }}]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc-cyrus}/smtpd.conf
 template = inline:
     pwcheck_method: auxprop
@@ -95,7 +99,7 @@ command =
 update-command = ${:command}
 
 [divert]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc-postfix}/divert
 {% if divert -%}
 template = inline:{{ "/.*/ {{ ', '.join(divert) }}" }}
@@ -121,7 +125,7 @@ update =
   ${:openssl} req -newkey rsa -batch -new -x509 -days 3650 -nodes -keyout '${:key}' -out '${:cert}'
 
 [{{ section('postfix-main-cf') }}]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc-postfix}/main.cf
 template = {{ parameter_dict['template-postfix-main-cf'] }}
 context =
@@ -144,13 +148,13 @@ context =
     key dh_2048 smtpd-ssl:dh-2048
 
 [{{ section('postfix-master-cf') }}]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc-postfix}/master.cf
 template = {{ parameter_dict['template-postfix-master-cf'] }}
 context = key smtp configuration:smtp
 
 [aliases]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 template = {{ parameter_dict['template-postfix-aliases'] }}
 rendered = ${directory:etc-postfix}/aliases
 context =

stack/erp5/instance-zope.cfg.in

@@ -14,6 +14,10 @@ partition. No more (undefined result), no less (IndexError).
 -#}
 {% set ipv4 = (ipv4_set | list)[0] -%}
 
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+mode = 644
+
 {% if slapparameter_dict['mysql-test-url-list'] -%}
 [{{ section('test-runner') }}]
 recipe = slapos.cookbook:erp5.test
@@ -143,7 +147,7 @@ hostalias-dict = {{ dumps(slapparameter_dict['hostalias-dict']) }}
 # ...so it's not possible to merge these templates (not a big deal anyway).
 
 [hostaliases]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 template = inline: {{ '
   {% for alias, aliased in host_dict.items() -%}
   {{ alias }} {{ aliased }}
@@ -153,7 +157,7 @@ rendered = ${directory:etc}/hostaliases
 context = key host_dict hosts-parameter:hostalias-dict
 
 [hosts]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 template = inline: {{ '
   {% for alias, aliased in host_dict.items() -%}
   {{ aliased }} {{ alias }}
@@ -171,7 +175,7 @@ context = key host_dict hosts-parameter:host-dict
                     ('_key', 'neo.key')) -%}
 {%       if k in storage_dict -%}
 [{{ section('neo-ssl-' + k[1:]) }}]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:etc}/{{v}}
 template = inline:{{'{{'}}pem}}
 context = key pem :pem
@@ -204,7 +208,7 @@ target-directory = ${directory:instance-etc}
 file-list = {{ parameter_dict['site-zcml'] }}
 
 [{{ section('zope-inituser') }}]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 rendered = ${directory:instance}/inituser
 template = inline:{{ slapparameter_dict['inituser-login'] }}:{SHA}{{ hashlib.sha1(slapparameter_dict['inituser-password']).digest().encode('base64').rstrip() }}
 mode = 600
@@ -253,7 +257,7 @@ webdav = {{ dumps(webdav) }}
 timerserver-interval = {{ dumps(timerserver_interval) }}
 
 [zope-conf-base]
-recipe = slapos.recipe.template:jinja2
+< = jinja2-template-base
 template = {{ parameter_dict['zope-conf-template'] }}
 
 [logrotate-entry-base]

stack/erp5/instance.cfg.in

@@ -4,6 +4,7 @@ extends = {{ instance_common_cfg }}
 [jinja2-template-base]
 context +=
     raw slapos_core_version {{ slapos_core_version }}
+mode = 644
 
 [dynamic-template-cloudooo-parameters]
 cairo = {{ cairo_location }}