Skip to content

slapos
slapos
Commit 8e017877 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Make it work 01

parent 210767de
Show whitespace changes
Inline Side-by-side
Showing with 203 additions and 135 deletions
component/imagemagick/buildout.cfg
View file @ 8e017877
...@@ -27,8 +27,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch ...@@ -27,8 +27,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
[imagemagick] [imagemagick]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.6-4.tar.bz2 url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.6-7.tar.gz
md5sum = 7551edb219459fcbc71abb8ce65b8952 md5sum = 5d1ee4f90f44d98b9736ac4f228f58cd
depends = depends =
${libtiff:version} ${libtiff:version}
configure-options = configure-options =
......
software/cloudooo/instance-cloudoo.cfg.in 0 → 100644
View file @ 8e017877
{% set json = json_module.loads(parameter_dict.get('cloudooo-json', '{}')) -%}
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
[buildout]
parts =
publish-cloudooo-connection-information
cloudooo-instance
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[publish-cloudooo-connection-information]
recipe = slapos.cookbook:publishurl
url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
[cloudooo-instance]
recipe = slapos.cookbook:generic.cloudooo
# Network options
ip = ${slap-network-information:local-ipv4}
port = 23000
openoffice-port = 23060
# Paths
configuration-file = ${rootdirectory:etc}/cloudooo.cfg
wrapper = ${basedirectory:services}/cloudooo
# Paths: Data
data-directory = ${directory:cloudooo-data}
environment =
LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
# Binary information
# cloudooo specific configuration
ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
ooo-paster = {{ bin_directory }}/cloudooo_paster
ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
[fontconfig-instance]
recipe = slapos.cookbook:fontconfig
conf-path = ${rootdirectory:etc}/font.conf
font-system-folder = {{ parameter_dict['fonts'] }}
font-folder = ${directory:font}
url-list = {{ json.get('font_url_list', []) | join(' ') }}
service-folder = ${basedirectory:services}
onetimedownload_path = {{ bin_directory }}/onetimedownload
# rest of parts are candidates for some generic stuff
[basedirectory]
recipe = slapos.cookbook:mkdirectory
services = ${rootdirectory:etc}/run
[directory]
recipe = slapos.cookbook:mkdirectory
cloudooo-data = ${rootdirectory:srv}/cloudooo
font = ${rootdirectory:srv}/font
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
srv = ${buildout:directory}/srv
software/cloudooo/instance.cfg deleted 100755 → 0
View file @ 210767de
[buildout]
parts =
instance
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module}
# cloudooo specific configuration
ooo_binary_path = ${libreoffice-bin:location}/program
ooo_paster = ${buildout:bin-directory}/cloudooo_paster
ooo_uno_path = ${libreoffice-bin:location}/basis-link/program
dcrond_binary = ${dcron:location}/sbin/crond
openssl_binary = ${openssl:location}/bin/openssl
rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
stunnel_binary = ${stunnel:location}/bin/stunnel
runUnitTest_binary = ${buildout:bin-directory}/runCloudoooUnitTest
link_binary_list =
${poppler:location}/bin/pdfinfo
${poppler:location}/bin/pdftotext
${ffmpeg:location}/bin/ffmpeg
${ffmpeg:location}/bin/ffprobe
${imagemagick:location}/bin/convert
${imagemagick:location}/bin/identify
${pdftk:location}/bin/pdftk
environment =
LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender:location}/lib:${zlib:location}/lib
software/cloudooo/instance.cfg.in 0 → 100644
View file @ 8e017877
[buildout]
parts =
switch-softwaretype
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap-parameters]
recipe = slapos.cookbook:slapparameters
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
extra-context =
context =
key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
jsonkey slapparameter_dict slap-parameters:json
${:extra-context}
[dynamic-template-cloudooo-parameters]
file = {{ file_location }}
fontconfig = {{ fontconfig_location }}
freetype = {{ freetype_location }}
libICE = {{ libICE_location }}
libpng12 = {{ libpng12_location }}
libSM = {{ libSM_location }}
libX11 = {{ libX11_location }}
libXau = {{ libXau_location }}
libXdmcp = {{ libXdmcp_location }}
libXext = {{ libXext_location }}
libxcb = {{ libxcb_location }}
libXrender = {{ libXrender_location }}
zlib = {{ zlib_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
fonts = {{ fonts_location }}
buildout-bin-directory = {{ buildout_bin_directory }}
[dynamic-template-cloudooo]
< = jinja2-template-base
template = {{ template_cloudooo }}
filename = instance-cloudoo.cfg
extra-context =
section parameter_dict dynamic-template-cloudooo-parameters
import json_module json
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type default
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${dynamic-template-cloudooo:rendered}
[slap-connection]
# part to migrate to new - separated words
computer-id = ${slap_connection:computer_id}
partition-id = ${slap_connection:partition_id}
server-url = ${slap_connection:server_url}
software-release-url = ${slap_connection:software_release_url}
key-file = ${slap_connection:key_file}
cert-file = ${slap_connection:cert_file}
software/cloudooo/software.cfg
View file @ 8e017877
[buildout] [buildout]
extends = extends =
../../stack/shacache-client.cfg
../../stack/cloudooo.cfg ../../stack/cloudooo.cfg
versions = versions versions = versions
# Local development # Local development
develop = develop +=
${:parts-directory}/slapos.cookbook-repository ${:parts-directory}/slapos.cookbook-repository
parts += parts +=
# Local development # Local development
slapos.cookbook-repository slapos.cookbook-repository
check-recipe check-recipe
slapos.cookbook-python2.6 slapos.cookbook-python2.6
slapos.recipe.template-python2.6
# Create instance template # Create instance template
template template
...@@ -25,7 +27,8 @@ unzip = true ...@@ -25,7 +27,8 @@ unzip = true
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = ${git:location}/bin/git clone --branch cloudooo --quiet http://git.erp5.org/repos/slapos.git ${:location} #command = ${git:location}/bin/git clone --branch cloudooo --quiet http://git.erp5.org/repos/slapos.git ${:location}
command = ${git:location}/bin/git clone --branch cloudooo --quiet /opt/slapdev ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[check-recipe] [check-recipe]
...@@ -41,102 +44,58 @@ scripts = ...@@ -41,102 +44,58 @@ scripts =
python = python2.6 python = python2.6
ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command} ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
[template] [slapos.recipe.template-python2.6]
# Default template for cloudooo instance. recipe = zc.recipe.egg
recipe = slapos.recipe.template eggs = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg scripts =
md5sum = faefc7749aefa9789fa94e77e95943be python = python2.6
output = ${buildout:directory}/template.cfg
mode = 0644
[versions]
AccessControl = 2.13.4
Jinja2 = 2.6
Paste = 1.7.5.1
PasteScript = 1.7.4.2
Products.OFSP = 2.13.2
Werkzeug = 0.8.2
buildout-versions = 1.6
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.download = 1.5.0
ipdb = 0.4
lxml = 2.3.2
manuel = 1.5.0
mechanize = 0.2.5
meld3 = 0.6.7
psutil = 0.3.0
rdiff-backup = 1.0.5
# Unpined locally developed egg
slapos.cookbook =
slapos.core = 0.21
slapos.recipe.template = 2.2
#Required by:
#cloudooo 1.2.4
#PasteScript 1.7.3
PasteDeploy = 1.5.0
#Required by:
#cloudooo 1.2.4
WSGIUtils = 0.7
# Required by:
# cloudooo 1.2.4
python-magic = 0.4.0.1
#Required by:
# slapos.core==0.21
#cloudooo 1.2.4
argparse = 1.2.1
#Required by:
# slapos.core==0.21
#Zope2 2.13.7
#cloudooo 1.2.4
zope.interface = 3.8.0
# Required by:
# ipdb 0.4
ipython = 0.10.2
#Required by:
#slapos.recipe.template 1.1
collective.recipe.template = 1.8
#Required by:
# slapos.core==0.21
Flask = 0.7.2
#Required by:
# slapos.core==0.21
netifaces = 0.6
#Required by:
# slapos.core==0.21
supervisor = 3.0a12
#Required by:
# slapos.cookbook==0.38
xml-marshaller = 0.9.7
#Required by:
# slapos.cookbook==0.38
zc.recipe.egg = 1.3.2
#Required by:
# slapos.cookbook==0.38
PyXML = 0.8.5
#Required by:
# slapos.cookbook==0.38
slapos.core = 0.12
#Required by: [template-jinja2-base]
# slapos.core==0.21 recipe = slapos.recipe.template:jinja2
# slapos.cookbook==0.38 template = ${:_profile_base_location_}/${:filename}.in
netaddr = 0.7.5 rendered = ${buildout:directory}/${:filename}
# XXX: extra-context is needed because we cannot append to a key of an extended
# section.
extra-context =
context =
key bin_directory buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
${:extra-context}
#Required by: [template]
# zc.buildout==1.6.0-dev-SlapOS-003 < = template-jinja2-base
setuptools = 0.6c12dev-r88846 # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 5f3efb79caca9f50951bce44e0a0f54a
extra-context =
key buildout_bin_directory buildout:bin-directory
key dcron_location dcron:location
key file_location file:location
key fontconfig_location fontconfig:location
key fonts_location fonts:location
key freetype_location freetype:location
key git_location git:location
key imagemagick_location imagemagick:location
key libICE_location libICE:location
key libSM_location libSM:location
key libX11_location libX11:location
key libXau_location libXau:location
key libXdmcp_location libXdmcp:location
key libXext_location libXext:location
key libXrender_location libXrender:location
key libpng12_location libpng12:location
key libreoffice_bin_location libreoffice-bin:location
key libxcb_location libxcb:location
key openssl_location openssl:location
key pdftk_location pdftk:location
key poppler_location poppler:location
key template_cloudooo template-cloudooo:target
key zlib_location zlib:location
[template-cloudooo]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum = ed1c1c1d00a2e12751a4f9da9c165b16
mode = 640
stack/cloudooo.cfg
View file @ 8e017877
...@@ -56,10 +56,21 @@ parts = ...@@ -56,10 +56,21 @@ parts =
pdftk pdftk
ffmpeg ffmpeg
instance-recipe-egg
bootstrap2.6 bootstrap2.6
rdiff-backup rdiff-backup
cloudooo cloudooo
cloudooo-check-recipe
instance-recipe-egg
# Local development
develop +=
${:parts-directory}/cloudooo
[cloudooo-check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
[cloudooo] [cloudooo]
recipe = plone.recipe.command recipe = plone.recipe.command
...@@ -71,7 +82,6 @@ revision = ...@@ -71,7 +82,6 @@ revision =
command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
[instance-recipe-egg] [instance-recipe-egg]
recipe = zc.recipe.egg recipe = zc.recipe.egg
python = python2.6 python = python2.6
...@@ -82,13 +92,15 @@ eggs = ...@@ -82,13 +92,15 @@ eggs =
python-magic python-magic
psutil psutil
WSGIUtils WSGIUtils
cloudooo
entry-points = entry-points =
main=cloudooo.paster_application:application
cloudooo_tester=cloudooo.bin.cloudooo_tester:main cloudooo_tester=cloudooo.bin.cloudooo_tester:main
runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
scripts = scripts =
paster=cloudooo_paster paster=cloudooo_paster
runCloudoooUnitTest runCloudoooUnitTest
ugly-depend-on = ${cloudooo:command} ${cloudooo:update-command}
[bootstrap2.6] [bootstrap2.6]
python = python2.6 python = python2.6
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7