Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
d5bed15d
Commit
d5bed15d
authored
Sep 27, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Nov 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/lamp: Switch to monitor-promise-base
Also drop now needless etc/promise directory.
parent
95290032
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
23 deletions
+3
-23
stack/lamp/buildout.hash.cfg
stack/lamp/buildout.hash.cfg
+2
-2
stack/lamp/instance-apache-php.cfg.in
stack/lamp/instance-apache-php.cfg.in
+1
-12
stack/lamp/instance-lamp.cfg.jinja2.in
stack/lamp/instance-lamp.cfg.jinja2.in
+0
-9
No files found.
stack/lamp/buildout.hash.cfg
View file @
d5bed15d
...
@@ -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 =
5212aed6c82876509eae9eda0975ffa1
[instance-lamp]
[instance-lamp]
filename = instance-lamp.cfg.jinja2.in
filename = instance-lamp.cfg.jinja2.in
md5sum =
cefe97d3a80d10655212d64ced180b2a
md5sum =
fe0fd8b6691323053b06f72701a3c82b
[template-apache.conf]
[template-apache.conf]
filename = apache.conf.in
filename = apache.conf.in
...
...
stack/lamp/instance-apache-php.cfg.in
View file @
d5bed15d
...
@@ -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}
...
...
stack/lamp/instance-lamp.cfg.jinja2.in
View file @
d5bed15d
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment