Commit 742de4c0 authored by Tom Niget's avatar Tom Niget

Build works with lamp; apache, mariadb, and postfix are started

parent 4fd22401
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
# section inheritance (< = ...) are NOT supported (but you should really # section inheritance (< = ...) are NOT supported (but you should really
# not need these here). # not need these here).
[template] [template-mail-server-instance]
filename = mail-server-instance.cfg.in filename = mail-server-instance.cfg.in
md5sum = 403a4a362b2ffec05f8d0b591bab92fa md5sum = 773f5b61e35ab05cc187ada9ee51d164
[template-default] [template-default]
_update_hash_filename_ = instance-default.cfg.in _update_hash_filename_ = mail-server-instance-default.cfg.in
md5sum = ba6ba781538d143387b677e4c4f09804 md5sum = ba6ba781538d143387b677e4c4f09804
[dovecot.jinja2.conf] [dovecot.jinja2.conf]
......
...@@ -189,9 +189,8 @@ hash-files = ...@@ -189,9 +189,8 @@ hash-files =
${postfix-conf-main:output} ${postfix-conf-main:output}
${postfix-wrapper:output} ${postfix-wrapper:output}
[publish-connection-parameters] [publish-connection-information]
recipe = slapos.cookbook:publish # reuse lamp section
<= monitor-publish
imap-port = 10143 imap-port = 10143
smtp-port = 10025 smtp-port = 10025
imap-smtp-ipv6 = ${slap-configuration:ipv6-random} imap-smtp-ipv6 = ${slap-configuration:ipv6-random}
......
[buildout]
parts =
switch-softwaretype
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[default-dynamic-template-parameters] [default-dynamic-template-parameters]
bin-directory = ${buildout:bin-directory} bin-directory = ${buildout:bin-directory}
buildout-bin-directory = ${buildout:bin-directory} buildout-bin-directory = ${buildout:bin-directory}
...@@ -13,7 +5,7 @@ buildout-bin-directory = ${buildout:bin-directory} ...@@ -13,7 +5,7 @@ buildout-bin-directory = ${buildout:bin-directory}
[dynamic-template-default] [dynamic-template-default]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
url = ${template-default:target} url = ${template-default:target}
filename = instance-default.cfg filename = mail-server-instance-default.cfg
output = $${buildout:directory}/$${:filename} output = $${buildout:directory}/$${:filename}
extensions = jinja2.ext.do extensions = jinja2.ext.do
context = context =
......
[buildout] [buildout]
extends = extends =
../../component/python-cffi/buildout.cfg
../../component/xz-utils/buildout.cfg ../../component/xz-utils/buildout.cfg
../../component/postfix/buildout.cfg ../../component/postfix/buildout.cfg
../../component/dovecot/buildout.cfg ../../component/dovecot/buildout.cfg
# ../../component/mariadb/buildout.cfg # ../../component/mariadb/buildout.cfg
../../stack/monitor/buildout.cfg
# ../../stack/slapos.cfg # ../../stack/slapos.cfg
../../stack/lamp/buildout.cfg ../../stack/lamp/buildout.cfg
../../stack/monitor/buildout.cfg
buildout.hash.cfg buildout.hash.cfg
parts = parts =
...@@ -28,17 +27,13 @@ configure-options-AUXLIBS = '-L${mariadb:location}/lib -Wl,-rpath=${mariadb:loca ...@@ -28,17 +27,13 @@ configure-options-AUXLIBS = '-L${mariadb:location}/lib -Wl,-rpath=${mariadb:loca
# output = ${buildout:directory}/template.cfg # output = ${buildout:directory}/template.cfg
[template-mail-server-instance] [template-mail-server-instance]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/instance-mail-server.cfg output = ${buildout:directory}/mail-server-instance.cfg
extensions = jinja2.ext.do
# [download-base]
# recipe = slapos.recipe.build:download
# url = ${:_profile_base_location_}/${:_update_hash_filename_}
[template-default] [template-default]
<= download-base recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_update_hash_filename_}
[copy-to-instance] [copy-to-instance]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
...@@ -63,4 +58,6 @@ filename = ${:_buildout_section_name_} ...@@ -63,4 +58,6 @@ filename = ${:_buildout_section_name_}
url = https://github.com/the-djmaze/snappymail/releases/download/v2.38.2/snappymail-2.38.2.tar.gz url = https://github.com/the-djmaze/snappymail/releases/download/v2.38.2/snappymail-2.38.2.tar.gz
md5sum = 551af7a01691f8d988c16aa73c75e686 md5sum = 551af7a01691f8d988c16aa73c75e686
# [custom-application-deployment] [custom-application-deployment]
path = ${template-mail-server-instance:output}
part = switch-softwaretype
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"default": { "default": {
"title": "Default", "title": "Default",
"software-type": "default", "software-type": "default",
"request": "instance-default-input-schema.json", "request": "mail-server-instance-default-input-schema.json",
"response": "instance-default-output-schema.json", "response": "mail-server-instance-default-output-schema.json",
"index": 0 "index": 0
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment