diff --git a/component/haproxy/buildout.cfg b/component/haproxy/buildout.cfg index 01ae447bbd713bd0bec0f3b65d945a9aa1aaf9f9..4c06e4bb1d043711c142f3e9f98b9c6892d90073 100644 --- a/component/haproxy/buildout.cfg +++ b/component/haproxy/buildout.cfg @@ -9,8 +9,8 @@ parts = haproxy [haproxy] recipe = slapos.recipe.cmmi -url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.23.tar.gz -md5sum = 6535d5e58037ada4b58b439cebe03c79 +url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.24.tar.gz +md5sum = 86422620faa9759907563d5e0524b98c configure-command = true # If the system is running on Linux 2.6, we use "linux26" as the TARGET, # otherwise use "generic". diff --git a/component/varnish/buildout.cfg b/component/varnish/buildout.cfg index e329aaf5f5e85d33af1063086263195c19dbe83a..a5d5b83568fcab339f42c9519f1f0fc08dd00073 100644 --- a/component/varnish/buildout.cfg +++ b/component/varnish/buildout.cfg @@ -10,6 +10,7 @@ extends = ../ncurses/buildout.cfg ../pcre/buildout.cfg ../pkgconfig/buildout.cfg + ../readline/buildout.cfg [varnish] <= varnish-2.0 @@ -35,10 +36,10 @@ configure-options = environment = PATH=${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig - CPPFLAGS=-I${ncurses:location}/include - LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib + CPPFLAGS=-I${ncurses:location}/include -I${readline:location}/include + LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib [varnish-3.0] <= varnish-2.1 -url = http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz -md5sum = 714310c83fdbd2061d897dacd3f63d8b +url = http://repo.varnish-cache.org/source/varnish-3.0.4.tar.gz +md5sum = a130ce9c3504b9603a46542635e18701 diff --git a/software/jio/instance.cfg.in b/software/jio/instance.cfg.in index c0acf7bd4179447c331bf70f6a7c3460721b5024..cb4b558ff2fad9efe5422f784b27029a800a98d3 100644 --- a/software/jio/instance.cfg.in +++ b/software/jio/instance.cfg.in @@ -16,9 +16,6 @@ offline = true [directory] recipe = slapos.cookbook:mkdirectory etc = $${buildout:directory}/etc -script = $${:etc}/run/ -service = $${:etc}/service -promise = $${:etc}/promise/ bin = $${buildout:directory}/bin/ [download-source] diff --git a/software/jio/software.cfg b/software/jio/software.cfg index 79b6440c1deee660fd9ef913a5df0e6d68a3d88b..d092daf0634fff58462dd05cfcf7237a81a10b9f 100644 --- a/software/jio/software.cfg +++ b/software/jio/software.cfg @@ -8,12 +8,7 @@ extends = ../../component/python-2.7/buildout.cfg ../../component/python-setuptools/buildout.cfg -# Local development -develop = - ${:parts-directory}/slapos.cookbook-repository parts = - slapos.cookbook-repository - slapos-cookbook template phantomjs eggs @@ -30,20 +25,12 @@ entry-points = scripts = 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] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg.in output = ${buildout:directory}/instance.cfg # MD5 checksum can be skipped for development, but must be filled for production -md5sum = 94421503ca09f77ee1e94e4b1ef4e6a7 +md5sum = 50fd41ad6f4aa6c49f4c80e3a81df61f mode = 0644 [jio-repository] @@ -64,7 +51,7 @@ lxml = 3.1.1 meld3 = 0.6.10 plone.recipe.command = 1.1 psutil = 0.6.1 -slapos.cookbook = 0.76.0 +slapos.cookbook = 0.78.1 slapos.recipe.build = 0.11.6 slapos.recipe.template = 2.4.2 diff --git a/software/zabbix-agent/README.rst b/software/zabbix-agent/README.rst new file mode 100644 index 0000000000000000000000000000000000000000..a1dad3ce51340be82a77e8f0f995228c429a50b7 --- /dev/null +++ b/software/zabbix-agent/README.rst @@ -0,0 +1,69 @@ +============================ +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> + diff --git a/software/zabbix-agent/README.txt b/software/zabbix-agent/README.txt deleted file mode 100644 index 45f2dde34903bc5c841e52d893d2c60012f3caf5..0000000000000000000000000000000000000000 --- a/software/zabbix-agent/README.txt +++ /dev/null @@ -1,17 +0,0 @@ -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> diff --git a/software/zabbix-agent/software.cfg b/software/zabbix-agent/software.cfg index 68b89a9d90c9f9fdda8100de5582cac5a2c26318..974591924d3eae3eee3507459fd9fdcdd002443a 100644 --- a/software/zabbix-agent/software.cfg +++ b/software/zabbix-agent/software.cfg @@ -52,73 +52,49 @@ signature-certificate-list = [versions] Jinja2 = 2.6 -Pygments = 1.5 Werkzeug = 0.8.3 buildout-versions = 1.7 -docutils = 0.9.1 -hexagonit.recipe.cmmi = 1.6 -ipython = 0.13 -meld3 = 0.6.8 -slapos.cookbook = 0.59 -slapos.recipe.template = 2.4 +inotifyx = 0.2.0-1 +lxml = 3.2.0 +meld3 = 0.6.10 +netaddr = 0.7.10 +pytz = 2013b +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: -# slapos.core==0.26.2 +# slapos.core==0.35.1 Flask = 0.9 # Required by: -# hexagonit.recipe.cmmi==1.6 -hexagonit.recipe.download = 1.6nxd002 - -# 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 +# slapos.core==0.35.1 +netifaces = 0.8-1 # Required by: -# slapos.cookbook==0.59 -# slapos.core==0.26.2 -# xml-marshaller==0.9.7 -lxml = 2.3.4 +# slapos.core==0.35.1 +pyflakes = 0.7.2 # Required by: -# slapos.cookbook==0.59 -netaddr = 0.7.7 - -# Required by: -# slapos.core==0.26.2 -netifaces = 0.8 - -# 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 +# hexagonit.recipe.download==1.6nxd002 +# slapos.cookbook==0.78.0 +# slapos.core==0.35.1 +# supervisor==3.0b1 +# zc.buildout==1.6.0-dev-SlapOS-010 +# zope.interface==4.0.5 setuptools = 0.6c12dev-r88846 # Required by: -# slapos.cookbook==0.59 -slapos.core = 0.26.2 +# slapos.core==0.35.1 +supervisor = 3.0b1 # Required by: -# slapos.core==0.26.2 -supervisor = 3.0a12 +# slapos.core==0.35.1 +unittest2 = 0.5.1 # Required by: -# slapos.cookbook==0.59 -xml-marshaller = 0.9.7 +# slapos.core==0.35.1 +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 diff --git a/stack/slapos.cfg b/stack/slapos.cfg index 1dbb3fce20f894360a694b3f2bc5a78ab0d01fbb..b1ffdde1bea6c3eb34f3cc2594045c6bf405282f 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -70,8 +70,6 @@ eggs = [versions] # Use SlapOS patched zc.buildout 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 = 1.3.2 # Use own version of h.r.download to be able to open xz-like archives