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
Alain Takoudjou
slapos
Commits
efd20411
Commit
efd20411
authored
6 years ago
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[software/htmlvalidatorserver] Add the monitor stack
parent
ba782cb7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
8 deletions
+48
-8
software/htmlvalidatorserver/instance-validator.cfg.in
software/htmlvalidatorserver/instance-validator.cfg.in
+12
-5
software/htmlvalidatorserver/software.cfg
software/htmlvalidatorserver/software.cfg
+35
-2
software/htmlvalidatorserver/template-tomcat-service.sh.in
software/htmlvalidatorserver/template-tomcat-service.sh.in
+1
-1
No files found.
software/htmlvalidatorserver/instance-validator.cfg.in
View file @
efd20411
###############################
###############################
# Instanciate nvu
# Instanciate nvu
###############################
###############################
[directory]
[
base
directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
etc = $${buildout:directory}/etc
bin = $${buildout:directory}/bin
bin = $${buildout:directory}/bin
...
@@ -26,7 +26,7 @@ catalina_conf = $${:catalina_base}/conf
...
@@ -26,7 +26,7 @@ catalina_conf = $${:catalina_base}/conf
[tomcat-service]
[tomcat-service]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${template-tomcat-service:output}
url = ${template-tomcat-service:output}
output = $${directory:services}/tomcat
output = $${
base
directory:services}/tomcat
mode = 0700
mode = 0700
virtual-depends =
virtual-depends =
$${tomcat-configuration:ip}
$${tomcat-configuration:ip}
...
@@ -34,7 +34,7 @@ virtual-depends =
...
@@ -34,7 +34,7 @@ virtual-depends =
[tomcat-configuration]
[tomcat-configuration]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${template-tomcat-configuration:output}
url = ${template-tomcat-configuration:output}
output = $${directory:catalina_conf}/server.xml
output = $${
base
directory:catalina_conf}/server.xml
mode = 0600
mode = 0600
ip = $${slap-network-information:global-ipv6}
ip = $${slap-network-information:global-ipv6}
port = 8899
port = 8899
...
@@ -43,21 +43,28 @@ port = 8899
...
@@ -43,21 +43,28 @@ port = 8899
recipe = slapos.cookbook:check_port_listening
recipe = slapos.cookbook:check_port_listening
hostname = $${tomcat-configuration:ip}
hostname = $${tomcat-configuration:ip}
port = $${tomcat-configuration:port}
port = $${tomcat-configuration:port}
path = $${directory:promises}/tomcat_listen
path = $${
base
directory:promises}/tomcat_listen
#################################
#################################
# Slapos publish
# Slapos publish
#################################
#################################
[publish-url]
[publish-url]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
url = http://[$${tomcat-configuration:ip}]:$${tomcat-configuration:port}/
<= monitor-publish
vnu-url = http://[$${tomcat-configuration:ip}]:$${tomcat-configuration:port}/
[monitor-instance-parameter]
monitor-httpd-port = 8333
# Add parts generated by template
# Add parts generated by template
[buildout]
[buildout]
extends =
${monitor-template:rendered}
parts =
parts =
publish-url
publish-url
tomcat-service
tomcat-service
tomcat-listen-promise
tomcat-listen-promise
monitor-base
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
...
This diff is collapsed.
Click to expand it.
software/htmlvalidatorserver/software.cfg
View file @
efd20411
...
@@ -7,6 +7,8 @@ extends =
...
@@ -7,6 +7,8 @@ extends =
../../component/tomcat/buildout.cfg
../../component/tomcat/buildout.cfg
../../component/vnu/buildout.cfg
../../component/vnu/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts =
parts =
slapos-cookbook
slapos-cookbook
...
@@ -25,7 +27,7 @@ mode = 0644
...
@@ -25,7 +27,7 @@ mode = 0644
[template-tomcat-service]
[template-tomcat-service]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-tomcat-service.sh.in
url = ${:_profile_base_location_}/template-tomcat-service.sh.in
md5sum =
ac921bff4b6ed9bc649d72aabfced88b
md5sum =
09803fb71404edbccb32c44a0040dae4
output = ${buildout:directory}/template-tomcat-service.sh.in
output = ${buildout:directory}/template-tomcat-service.sh.in
mode = 0644
mode = 0644
...
@@ -35,7 +37,7 @@ mode = 0644
...
@@ -35,7 +37,7 @@ mode = 0644
[template-validator]
[template-validator]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-validator.cfg.in
url = ${:_profile_base_location_}/instance-validator.cfg.in
md5sum =
ffd825a0fb1c9f94e647dcefbf9de4ba
md5sum =
30c0294f5a0cad1f3c2833c1cc61b3c4
output = ${buildout:directory}/template-validator.cfg
output = ${buildout:directory}/template-validator.cfg
mode = 0644
mode = 0644
...
@@ -53,3 +55,34 @@ gunicorn = 19.1.1
...
@@ -53,3 +55,34 @@ gunicorn = 19.1.1
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
inotifyx = 0.2.2
inotifyx = 0.2.2
apache-libcloud = 2.2.1
gitdb2 = 2.0.3
smmap2 = 2.0.3
# Required by:
# slapos.toolbox==0.73
GitPython = 2.1.8
# Required by:
# slapos.toolbox==0.73
atomize = 0.2.0
# Required by:
# slapos.toolbox==0.73
dnspython = 1.15.0
# Required by:
# slapos.toolbox==0.73
erp5.util = 0.4.50
# Required by:
# slapos.toolbox==0.73
feedparser = 5.2.1
# Required by:
# slapos.toolbox==0.73
lockfile = 0.12.2
# Required by:
# slapos.toolbox==0.73
passlib = 1.7.1
This diff is collapsed.
Click to expand it.
software/htmlvalidatorserver/template-tomcat-service.sh.in
View file @
efd20411
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
# BEWARE: It will be overwritten automatically
# BEWARE: It will be overwritten automatically
export JRE_HOME=${java-re-8:location}
export JRE_HOME=${java-re-8:location}
export CATALINA_BASE=$${directory:catalina_base}
export CATALINA_BASE=$${
base
directory:catalina_base}
exec ${tomcat7-output:catalina} run
exec ${tomcat7-output:catalina} run
This diff is collapsed.
Click to expand it.
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