Commit 9ae624b7 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak

stack/lamp: Switch to monitor-promise-base

Also drop now needless etc/promise directory.
parent 972a3cf4
...@@ -18,11 +18,11 @@ md5sum = b4fbd7dc8d7fda7dbd1b80f3de273ecf ...@@ -18,11 +18,11 @@ md5sum = b4fbd7dc8d7fda7dbd1b80f3de273ecf
[instance-apache-php] [instance-apache-php]
filename = instance-apache-php.cfg.in filename = instance-apache-php.cfg.in
md5sum = 9d3eb7fcc44ac25bef8ee9df6eac8974 md5sum = a20bb27c0077b5a7252bda06ba7e069d
[instance-lamp] [instance-lamp]
filename = instance-lamp.cfg.jinja2.in filename = instance-lamp.cfg.jinja2.in
md5sum = cefe97d3a80d10655212d64ced180b2a md5sum = 7bac7f3a034e2afeaf479622ef18fb69
[template-apache.conf] [template-apache.conf]
filename = apache.conf.in filename = apache.conf.in
......
...@@ -37,8 +37,6 @@ services = ${:etc}/service ...@@ -37,8 +37,6 @@ services = ${:etc}/service
scripts = ${:etc}/run scripts = ${:etc}/run
run = ${:var}/run run = ${:var}/run
backup = ${:srv}/backup backup = ${:srv}/backup
promises = ${:etc}/promise
plugins = ${:etc}/plugin
httpd-log = ${:log}/apache httpd-log = ${:log}/apache
php-ini-dir = ${:etc}/php php-ini-dir = ${:etc}/php
tmp-php = ${:tmp}/php tmp-php = ${:tmp}/php
...@@ -206,18 +204,9 @@ backend-url = ${apache-php-configuration:url} ...@@ -206,18 +204,9 @@ backend-url = ${apache-php-configuration:url}
#---------------- #----------------
#-- #--
#-- Deploy promises scripts. #-- Deploy promises scripts.
[promise-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
mode = 644
output = ${directory:plugins}/${:name}
content =
from slapos.promise.plugin.${:module} import RunPromise
[promise] [promise]
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
<= promise-base <= monitor-promise-base
module = check_port_listening module = check_port_listening
name = apache-httpd-port-listening.py name = apache-httpd-port-listening.py
config-hostname = ${apache-php-configuration:ip} config-hostname = ${apache-php-configuration:ip}
...@@ -226,4 +215,4 @@ config-port = ${apache-php-configuration:port} ...@@ -226,4 +215,4 @@ config-port = ${apache-php-configuration:port}
[slap-parameter] [slap-parameter]
{% for key, value in slapparameter_dict.items() -%} {% for key, value in slapparameter_dict.items() -%}
{{ key }} = {{ value }} {{ key }} = {{ value }}
{% endfor -%} {% endfor -%}
\ No newline at end of file
...@@ -18,15 +18,6 @@ cert-file = ${slap-connection:cert-file} ...@@ -18,15 +18,6 @@ cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id} computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id} partition-id = ${slap-connection:partition-id}
[promise-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
mode = 644
output = ${directory:plugins}/$${:name}
content =
from slapos.promise.plugin.${:module} import RunPromise
[request-apache] [request-apache]
<= request-common <= request-common
software-type = apache software-type = apache
...@@ -136,4 +127,4 @@ parts = ...@@ -136,4 +127,4 @@ parts =
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
\ No newline at end of file
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