sync

software/mail-server/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template-mail-server-instance]
 filename = mail-server-instance.cfg.in
-md5sum = 773f5b61e35ab05cc187ada9ee51d164
+md5sum = 2362f94a0301714dd0fbb97743d7a88a
 
 [template-default]
 _update_hash_filename_ = mail-server-instance-default.cfg.in
-md5sum = ba6ba781538d143387b677e4c4f09804
+md5sum = 1c968ab9d9bedfeff15f13bcdb8858f8
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf

software/mail-server/mail-server-instance-default.cfg.in

@@ -190,7 +190,8 @@ hash-files =
   ${postfix-wrapper:output}
 
 [publish-connection-information]
-# reuse lamp section
+<= monitor-publish
+recipe = slapos.cookbook:publish
 imap-port = 10143
 smtp-port = 10025
 imap-smtp-ipv6 = ${slap-configuration:ipv6-random}
@@ -299,7 +300,7 @@ parts =
   postfix-service
   postfix-symlinks-libexec
   monitor-base
-  publish-connection-parameters
+  publish-connection-information
   imap-listen-promise
   smtp-listen-promise
   {{ part_list | join('\n  ') }}

software/mail-server/mail-server-instance.cfg.in

@@ -32,6 +32,10 @@ url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
 cert = $${slap-connection:cert-file}
 
-[switch-softwaretype]
+[publish-connection-parameters]
+imap-port = 10143
+smtp-port = 10025
+
+[switch-softwaretype-mserv]
 recipe = slapos.cookbook:switch-softwaretype
-default = dynamic-template-default:output
+apache = dynamic-template-default:output

software/mail-server/postfix_main.jinja2.cf

@@ -25,6 +25,8 @@ virtual_minimum_uid = 100
 virtual_uid_maps = static:1001
 virtual_gid_maps = static:1022
 virtual_alias_maps = hash:{{ virtual_file }}
+virtual_mailbox_maps = mysql:/etc/postfix/mysql_virtual_mailbox_maps.cf
+virtual_alias_maps = mysql:/etc/postfix/mysql_virtual_aliases.cf
 virtual_transport = lmtp:unix:private/dovecot-lmtp
 
 inet_interfaces = all
@@ -45,6 +47,7 @@ smtpd_recipient_restrictions =
 smtpd_relay_restrictions =
   permit_sasl_authenticated
   defer_unauth_destination
+  permit_mynetworks 
 
 allow_min_user = yes
 

software/mail-server/postfix_mysql_aliases.jinja2.cf

+user = postfix
+password = MonMotDePasseBaseDeDonnees
+hosts = 127.0.0.1
+dbname = postfix
+query = SELECT 1 FROM aliases WHERE source = '%s'
\ No newline at end of file

software/mail-server/postfix_mysql_mailbox.jinja2.cf

+user = postfix
+password = MonMotDePasseBaseDeDonnees
+hosts = 127.0.0.1
+dbname = postfix
+query = SELECT 1 FROM addresses WHERE email = '%s'
\ No newline at end of file

software/mail-server/software.cfg

@@ -58,6 +58,10 @@ filename = ${:_buildout_section_name_}
 url = https://github.com/the-djmaze/snappymail/releases/download/v2.38.2/snappymail-2.38.2.tar.gz
 md5sum = 551af7a01691f8d988c16aa73c75e686
 
-[custom-application-deployment]
+[dynamic-template-lamp-parameters]
+application-lamp-path = ${template-mail-server-instance:output}
+part-list = switch-softwaretype-mserv
+
+[custom-application-deployment-lamp]
 path = ${template-mail-server-instance:output}
-part = switch-softwaretype
+part-list = switch-softwaretype-mserv

stack/lamp/buildout.cfg

@@ -66,6 +66,13 @@ db-user = lamp
 # Publish default lamp slave frontend url
 default-frontend = True
 
+[custom-application-deployment-lamp]
+# path = /path/to/instance-custom.cfg
+# part-list = part1 part2
+# See software/maarch/software.cfg for an example.
+path =
+part-list =
+
 #----------------
 #-- Instance-level buildout profiles.
 
@@ -77,6 +84,7 @@ context =
     key application_location application:location
     key application_archive_root application:archive-root
     key application_deployment_part_list custom-application-deployment:part-list
+    key application_deployment_lamp_part_list custom-application-deployment-lamp:part-list
     key apache_location apache:location
     key apache_php_location apache-php:location
     key bash_location bash:location
@@ -112,6 +120,7 @@ context =
     key template_my_cnf template-my-cnf:target
     key unixodbc_location unixodbc:location
     key openssl_location openssl:location
+    key custom_application_lamp_template custom-application-deployment-lamp:path
     key custom_application_template custom-application-deployment:path
     key db_name custom-application-deployment:db-name
     key db_user custom-application-deployment:db-user

stack/lamp/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [lamp-instance]
 filename = instance.cfg.in
-md5sum = f34548ba607becf3acd5c5e3d8e70551
+md5sum = ed9589ab08ffefeb1eefeacd8ee97bb7
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
@@ -22,7 +22,7 @@ md5sum = 41602a61d5f9609281dbfa3f27da0626
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
-md5sum = de1f450a80547d12334b712016138078
+md5sum = 18e024ed67ea1f4ada10c01780d1975b
 
 [template-apache.conf]
 filename = apache.conf.in

stack/lamp/instance-lamp.cfg.jinja2.in

@@ -91,12 +91,16 @@ recipe = slapos.cookbook:publish
 extends =
   {{ template_monitor }}
 
+  {{ parameter_dict['application-lamp-path'] }}
+
 parts =
   publish-connection-information
 
 # Complete parts with sections
   {{ part_list | join('\n  ') }}
 
+  {{ parameter_dict['application-lamp-part-list'] }}
+
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true

stack/lamp/instance.cfg.in

@@ -43,6 +43,11 @@ context =
 [mariadb-password]
 recipe = slapos.cookbook:generate.password
 
+# XXX no failure if `custom_application_template` is empty
+[applica'tion-parameters]
+custom-application-template = {{ custom_application_template }}
+custom-application-lamp-template = {{ custom_application_lamp_template }}
+
 [dynamic-template-lamp-parameters]
 
 [dynamic-template-lamp]
@@ -50,6 +55,7 @@ recipe = slapos.cookbook:generate.password
 url = {{ template_lamp }}
 filename = template-lamp.cfg
 extra-context =
+  key custom_application_lamp_template application-parameters:custom-application-lamp-template
   section parameter_dict dynamic-template-lamp-parameters
   raw db_name {{ db_name }}
   raw db_user {{ db_user }}
@@ -68,10 +74,6 @@ apache-php-location = {{ apache_php_location }}
 template-php-ini = {{ template_php_ini }}
 publish-frontend = !py!{{ default_frontend }}
 
-# XXX no failure if `custom_application_template` is empty
-[application-parameters]
-custom-application-template = {{ custom_application_template }}
-
 [dynamic-template-apache-php]
 <= jinja2-template-base
 url = {{ template_apache_php }}