Commit d4b209ad authored by Tom Niget's avatar Tom Niget

enable lamp promise

parent 706b8690
......@@ -19,7 +19,7 @@ md5sum = bccd8d99888c3d4997443cae911eca79
[template-default]
_update_hash_filename_ = instance-default.cfg.in
md5sum = 493992df66bb5b1317de1794d84b7f83
md5sum = 5b843d5a0bb4f78936e51f3905bf482c
[dovecot.jinja2.conf]
_update_hash_filename_ = dovecot.jinja2.conf
......
......@@ -350,7 +350,7 @@ domain = ${request-dns-entry:connection-domain}
webmail-url = ${apache-php-configuration:url}
backup-crontab = ${postgresql-backup-crontab-entry:name}
{% if apache_parameter_dict['publish-frontend'] -%}
#url = ${lamp-frontend-promise:url}
webmail-url = ${lamp-frontend-promise:url}
{% endif -%}
[lamp-apache-httpd]
......@@ -494,11 +494,15 @@ basename = {{ basename }}
command-line = ${directory:usr}/libexec/postfix/master -c ${directory:etc-postfix}
wrapper-path = ${directory:run}/postfix-master
[monitor-instance-parameter]
#monitor-httpd-port = ${apache-network-configuration:listening-port}
[buildout]
extends =
{{ template_monitor }}
parts =
directory
lamp-frontend-promise
snappymail-conf
snappymail-domain
dovecot-conf
......@@ -515,6 +519,7 @@ parts =
php.ini-conf
lamp-apache-httpd
apache-php-service
request-frontend
{{ part_list | join('\n ') }}
{% if slapparameter_dict.get('request_dns', '') %}
request-dns-entry
......@@ -538,7 +543,6 @@ password = ${postgresql-password:passwd}
pgdata-directory = ${directory:srv}/postgresql
ipv4 = ${slap-configuration:ipv4-random}
# disable listening on ipv6
ipv6 = ${slap-configuration:ipv6-random}
port = 5432
......
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