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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
4374209a
Commit
4374209a
authored
Jun 19, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5' into erp5-z2.13
parents
a7ff5fa9
4a59959b
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
105 additions
and
94 deletions
+105
-94
component/haproxy/buildout.cfg
component/haproxy/buildout.cfg
+2
-2
component/varnish/buildout.cfg
component/varnish/buildout.cfg
+5
-4
software/jio/instance.cfg.in
software/jio/instance.cfg.in
+0
-3
software/jio/software.cfg
software/jio/software.cfg
+2
-15
software/zabbix-agent/README.rst
software/zabbix-agent/README.rst
+69
-0
software/zabbix-agent/README.txt
software/zabbix-agent/README.txt
+0
-17
software/zabbix-agent/software.cfg
software/zabbix-agent/software.cfg
+27
-51
stack/slapos.cfg
stack/slapos.cfg
+0
-2
No files found.
component/haproxy/buildout.cfg
View file @
4374209a
...
@@ -9,8 +9,8 @@ parts = haproxy
...
@@ -9,8 +9,8 @@ parts = haproxy
[haproxy]
[haproxy]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.2
3
.tar.gz
url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.2
4
.tar.gz
md5sum =
6535d5e58037ada4b58b439cebe03c79
md5sum =
86422620faa9759907563d5e0524b98c
configure-command = true
configure-command = true
# If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# otherwise use "generic".
# otherwise use "generic".
...
...
component/varnish/buildout.cfg
View file @
4374209a
...
@@ -10,6 +10,7 @@ extends =
...
@@ -10,6 +10,7 @@ extends =
../ncurses/buildout.cfg
../ncurses/buildout.cfg
../pcre/buildout.cfg
../pcre/buildout.cfg
../pkgconfig/buildout.cfg
../pkgconfig/buildout.cfg
../readline/buildout.cfg
[varnish]
[varnish]
<= varnish-2.0
<= varnish-2.0
...
@@ -35,10 +36,10 @@ configure-options =
...
@@ -35,10 +36,10 @@ configure-options =
environment =
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
CPPFLAGS=-I${ncurses:location}/include
CPPFLAGS=-I${ncurses:location}/include
-I${readline:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib
[varnish-3.0]
[varnish-3.0]
<= varnish-2.1
<= varnish-2.1
url = http://repo.varnish-cache.org/source/varnish-3.0.
3
.tar.gz
url = http://repo.varnish-cache.org/source/varnish-3.0.
4
.tar.gz
md5sum =
714310c83fdbd2061d897dacd3f63d8b
md5sum =
a130ce9c3504b9603a46542635e18701
software/jio/instance.cfg.in
View file @
4374209a
...
@@ -16,9 +16,6 @@ offline = true
...
@@ -16,9 +16,6 @@ offline = true
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
etc = $${buildout:directory}/etc
script = $${:etc}/run/
service = $${:etc}/service
promise = $${:etc}/promise/
bin = $${buildout:directory}/bin/
bin = $${buildout:directory}/bin/
[download-source]
[download-source]
...
...
software/jio/software.cfg
View file @
4374209a
...
@@ -8,12 +8,7 @@ extends =
...
@@ -8,12 +8,7 @@ extends =
../../component/python-2.7/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/python-setuptools/buildout.cfg
../../component/python-setuptools/buildout.cfg
# Local development
develop =
${:parts-directory}/slapos.cookbook-repository
parts =
parts =
slapos.cookbook-repository
slapos-cookbook
template
template
phantomjs
phantomjs
eggs
eggs
...
@@ -30,20 +25,12 @@ entry-points =
...
@@ -30,20 +25,12 @@ entry-points =
scripts =
scripts =
runTestSuite
runTestSuite
# Local development until new egg is published (extra parameters to slapos.cookbook:wrapper
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
forbid-download-cache = true
repository = http://git.erp5.org/repos/slapos.git
branch = master
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
output = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development, but must be filled for production
# MD5 checksum can be skipped for development, but must be filled for production
md5sum =
94421503ca09f77ee1e94e4b1ef4e6a7
md5sum =
50fd41ad6f4aa6c49f4c80e3a81df61f
mode = 0644
mode = 0644
[jio-repository]
[jio-repository]
...
@@ -64,7 +51,7 @@ lxml = 3.1.1
...
@@ -64,7 +51,7 @@ lxml = 3.1.1
meld3 = 0.6.10
meld3 = 0.6.10
plone.recipe.command = 1.1
plone.recipe.command = 1.1
psutil = 0.6.1
psutil = 0.6.1
slapos.cookbook = 0.7
6.0
slapos.cookbook = 0.7
8.1
slapos.recipe.build = 0.11.6
slapos.recipe.build = 0.11.6
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
...
...
software/zabbix-agent/README.rst
0 → 100644
View file @
4374209a
============================
Zabbix Agent Software Release
=============================
This Software Release allows to deploy a Zabbix Agent that will connect
to an existing Zabbix Server.
Please see http://www.zabbix.com/ for more informations.
Mandatory parameters
====================
hostname
--------
Name of the machine probed by the agent.
server
------
list of Zabbix servers to connect to, comma-seperated.
Optional parameters
===================
custom-user-parameter
---------------------
Add custom UserParameter(s) lines to the Zabbix Agent configuration file.
Examples of instance parameters XML
===================================
Example 1
~~~~~~~~~
Simple request: just request a new instance of it, with the following parameters::
<?xml version="1.0" encoding="utf-8"?>
<instance>
<parameter id="server">REPLACE BY IP(v6) OF ZABBIX SERVER</parameter>
<parameter id="hostname">REPLACE BY DESIRED HOSTNAME OF MACHINE</parameter>
</instance>
Example 2
~~~~~~~~~
Deploy a Zabbix Agent instance for machine named "mymachine" connecting to a Zabbix server accessible from 2001:41d0:1:9b1a::1::
<?xml version="1.0" encoding="utf-8"?>
<instance>
<parameter id="server">2001:41d0:1:9b1a::1</parameter>
<parameter id="hostname">mymachine</parameter>
</instance>
Example 3
~~~~~~~~~
Deploy a Zabbix Agent instance for machine named "mymachine" connecting to a Zabbix server accessible from 2001:41d0:1:9b1a::1, with several custom parameters::
<?xml version="1.0" encoding="utf-8"?>
<instance>
<parameter id="server">2001:41d0:1:9b1a::1</parameter>
<parameter id="hostname">mymachine</parameter>
<parameter id="custom-user-parameter">
UserParameter=custom_random,echo $RANDOM
UserParameter=custom_date,date
</parameter>
</instance>
software/zabbix-agent/README.txt
deleted
100644 → 0
View file @
a7ff5fa9
Zabbix Agent
============
This Software Release allows to deploy a Zabbix Agent that will connect
to an existing Zabbix Server.
How to request
==============
Just request a new instance of it, with the following parameters::
<?xml version="1.0" encoding="utf-8"?>
<instance>
<parameter id="server">REPLACE BY IP(v6) OF ZABBIX SERVER</parameter>
<parameter id="hostname">REPLACE BY DESIRED HOSTNAME OF MACHINE</parameter>
</instance>
software/zabbix-agent/software.cfg
View file @
4374209a
...
@@ -52,73 +52,49 @@ signature-certificate-list =
...
@@ -52,73 +52,49 @@ signature-certificate-list =
[versions]
[versions]
Jinja2 = 2.6
Jinja2 = 2.6
Pygments = 1.5
Werkzeug = 0.8.3
Werkzeug = 0.8.3
buildout-versions = 1.7
buildout-versions = 1.7
docutils = 0.9.1
inotifyx = 0.2.0-1
hexagonit.recipe.cmmi = 1.6
lxml = 3.2.0
ipython = 0.13
meld3 = 0.6.10
meld3 = 0.6.8
netaddr = 0.7.10
slapos.cookbook = 0.59
pytz = 2013b
slapos.recipe.template = 2.4
slapos.cookbook = 0.78.0
slapos.core = 0.35.1
slapos.recipe.cmmi = 0.1
slapos.recipe.template = 2.4.2
xml-marshaller = 0.9.7
# Required by:
# Required by:
# slapos.core==0.
26.2
# slapos.core==0.
35.1
Flask = 0.9
Flask = 0.9
# Required by:
# Required by:
# hexagonit.recipe.cmmi==1.6
# slapos.core==0.35.1
hexagonit.recipe.download = 1.6nxd002
netifaces = 0.8-1
# Required by:
# slapos.cookbook==0.59
PyXML = 0.8.4
# Required by:
# netaddr==0.7.7
Sphinx = 1.1.3
# Required by:
# slapos.cookbook==0.59
inotifyx = 0.2.0
# Required by:
# Required by:
# slapos.cookbook==0.59
# slapos.core==0.35.1
# slapos.core==0.26.2
pyflakes = 0.7.2
# xml-marshaller==0.9.7
lxml = 2.3.4
# Required by:
# Required by:
# slapos.cookbook==0.59
# hexagonit.recipe.download==1.6nxd002
netaddr = 0.7.7
# slapos.cookbook==0.78.0
# slapos.core==0.35.1
# Required by:
# supervisor==3.0b1
# slapos.core==0.26.2
# zc.buildout==1.6.0-dev-SlapOS-010
netifaces = 0.8
# zope.interface==4.0.5
# Required by:
# slapos.cookbook==0.59
# slapos.core==0.26.2
# zc.buildout==1.6.0-dev-SlapOS-006
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
# Required by:
# Required by:
# slapos.co
okbook==0.59
# slapos.co
re==0.35.1
s
lapos.core = 0.26.2
s
upervisor = 3.0b1
# Required by:
# Required by:
# slapos.core==0.
26.2
# slapos.core==0.
35.1
supervisor = 3.0a12
unittest2 = 0.5.1
# Required by:
# Required by:
# slapos.co
okbook==0.59
# slapos.co
re==0.35.1
xml-marshaller = 0.9.7
zope.interface = 4.0.5
# Required by:
# slapos.cookbook==0.59
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.26.2
zope.interface = 4.0.1
stack/slapos.cfg
View file @
4374209a
...
@@ -70,8 +70,6 @@ eggs =
...
@@ -70,8 +70,6 @@ eggs =
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-010
zc.buildout = 1.6.0-dev-SlapOS-010
# Use xz-friendly hexagonit.recipe.download
hexagonit.recipe.download = 1.6nxd002
# zc.recipe.egg 2.x is for Buildout 2
# zc.recipe.egg 2.x is for Buildout 2
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Use own version of h.r.download to be able to open xz-like archives
# Use own version of h.r.download to be able to open xz-like archives
...
...
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