Commit 35e37753 authored by Marco Mariani's avatar Marco Mariani

abilian: added stuff to library path, force configuration files to exist

complain if the configuration file is missing
temporarily use own branch for abilian-core
added to LD_LIBRARY_PATH: cups, dbus, dbus-glib, fontconfig
parent 75ae5802
...@@ -14,7 +14,7 @@ EXTRANET_INSTANCE_PATH=$${directories:extranet_spr-instance} ...@@ -14,7 +14,7 @@ EXTRANET_INSTANCE_PATH=$${directories:extranet_spr-instance}
EXTRANET_INSTANCE_HOST=$${instance-parameters:ipv6-random} EXTRANET_INSTANCE_HOST=$${instance-parameters:ipv6-random}
ABILIAN_CONFIG_EXTRA_PYTHON=$${config-staging-py:rendered} ABILIAN_CONFIG_EXTRA_PYTHON=$${config-staging-py:rendered}
ABILIAN_CONFIG_EXTRA_JSON=$${json-extra-configuration:json-output}:$${buildout:directory}/partition-parameters.json ABILIAN_CONFIG_EXTRA_JSON=$${json-extra-configuration:json-output}:$${buildout:directory}/partition-parameters.json
LD_LIBRARY_PATH=${cairo:location}/lib:${glib:location}/lib:${pango:location}/lib LD_LIBRARY_PATH=${cairo:location}/lib:${glib:location}/lib:${pango:location}/lib:${cups:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib
# abilian/services/conversion.py does not like it, if PATH does not exist # abilian/services/conversion.py does not like it, if PATH does not exist
PATH=/usr/sbin:/usr/bin:/sbin:/bin:${git:location}/bin:${poppler:location}/bin:${postgresql91:location}/bin:${redis:location}/bin:${unoconv-repository:location} PATH=/usr/sbin:/usr/bin:/sbin:/bin:${git:location}/bin:${poppler:location}/bin:${postgresql91:location}/bin:${redis:location}/bin:${unoconv-repository:location}
......
...@@ -18,8 +18,20 @@ link-binary = ...@@ -18,8 +18,20 @@ link-binary =
[extranet-service] [extranet-service]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = inline: template = inline:
#!/bin/sh #!/bin/bash
. {{environment}} . {{environment}}
[ -f "$${json-extra-configuration:json-output}" ] || {
echo "Configuration file $${json-extra-configuration:json-output} does not exist (yet?)" >&2
exit 10
}
[ -f "$${buildout:directory}/partition-parameters.json" ] || {
echo "Configuration file $${buildout:directory}/partition-parameters.json does not exist (yet?)" >&2
exit 20
}
[ -f "$${config-staging-py:rendered}" ] || {
echo "Configuration file $${config-staging-py:rendered} does not exist (yet?)" >&2
exit 30
}
exec {{abilian}} run exec {{abilian}} run
rendered = $${directories:services}/abilian-start rendered = $${directories:services}/abilian-start
mode = 700 mode = 700
......
...@@ -36,6 +36,7 @@ services = $${directories:services} ...@@ -36,6 +36,7 @@ services = $${directories:services}
template-postgresql-conf = template-postgresql-conf =
# This configuration file is generated by a SlapOS instance profile. Manual edits will be overwritten. # This configuration file is generated by a SlapOS instance profile. Manual edits will be overwritten.
listen_addresses = '{listen_addresses}' listen_addresses = '{listen_addresses}'
port = $${:port}
logging_collector = on logging_collector = on
log_rotation_size = 50MB log_rotation_size = 50MB
max_connections = 100 max_connections = 100
......
...@@ -12,9 +12,9 @@ extends = ...@@ -12,9 +12,9 @@ extends =
parts = parts =
directories directories
sh-instance-environment
json-configuration json-configuration
json-extra-configuration json-extra-configuration
sh-instance-environment
postgres-instance postgres-instance
postgres-promise postgres-promise
extranet-symlinks extranet-symlinks
......
...@@ -7,13 +7,16 @@ extends = ...@@ -7,13 +7,16 @@ extends =
../../../component/gmp/buildout.cfg ../../../component/gmp/buildout.cfg
../../../component/imagemagick/buildout.cfg ../../../component/imagemagick/buildout.cfg
../../../component/poppler/buildout.cfg ../../../component/poppler/buildout.cfg
../../../component/cups/buildout.cfg
../../../component/libreoffice-bin/buildout.cfg
../../../component/redis/buildout.cfg ../../../component/redis/buildout.cfg
../../../component/unoconv/buildout.cfg ../../../component/unoconv/buildout.cfg
../../../component/nginx/buildout.cfg ../../../component/nginx/buildout.cfg
../../../component/cups/buildout.cfg
../../../component/dbus/buildout.cfg
../../../component/gtk-2/buildout.cfg ../../../component/gtk-2/buildout.cfg
../../../component/glib/buildout.cfg ../../../component/glib/buildout.cfg
../../../component/fontconfig/buildout.cfg
../../../component/libreoffice-bin/buildout.cfg
parts = parts =
...@@ -44,6 +47,7 @@ parts = ...@@ -44,6 +47,7 @@ parts =
imagemagick imagemagick
poppler poppler
cups cups
dbus-glib
libreoffice-bin libreoffice-bin
redis redis
unoconv-repository unoconv-repository
...@@ -139,8 +143,8 @@ egg-link = progressbar.egg-link ...@@ -139,8 +143,8 @@ egg-link = progressbar.egg-link
[abilian-core-repository] [abilian-core-repository]
< = git-repository < = git-repository
repository = https://github.com/abilian/abilian-core.git repository = https://github.com/mmariani/abilian-core.git
branch = 0.1-maintenance branch = 0.1-maintenance-nxd
[abilian-core-repository-check] [abilian-core-repository-check]
< = git-repository-check < = git-repository-check
...@@ -222,14 +226,14 @@ configure-command = ...@@ -222,14 +226,14 @@ configure-command =
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
md5sum = 22523112a53b60cb09f131049d0fce90 md5sum = 963b22f55ba677441603e270ea973ed3
mode = 0644 mode = 0644
[instance-postgres] [instance-postgres]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-postgres.cfg.in url = ${:_profile_base_location_}/instance-postgres.cfg.in
output = ${buildout:directory}/instance-postgres.cfg output = ${buildout:directory}/instance-postgres.cfg
md5sum = 8b5557df0aeaa4ace93481688f2d5085 md5sum = e47ce979db2f12ac2b30814dd20f63f5
mode = 0644 mode = 0644
[instance-redis] [instance-redis]
...@@ -243,14 +247,14 @@ mode = 0644 ...@@ -243,14 +247,14 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-extranet.cfg.in url = ${:_profile_base_location_}/instance-extranet.cfg.in
output = ${buildout:directory}/instance-extranet.cfg output = ${buildout:directory}/instance-extranet.cfg
md5sum = 3e27239c513c9a7b959f9d118f6ad181 md5sum = c4e4727a36c5552631e50f98c4079344
mode = 0644 mode = 0644
[instance-environment] [instance-environment]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-environment.cfg.in url = ${:_profile_base_location_}/instance-environment.cfg.in
output = ${buildout:directory}/instance-environment.cfg output = ${buildout:directory}/instance-environment.cfg
md5sum = a74401a887080c9f3aea324a384c4e67 md5sum = 25ba374fe46091e25d1bc8197feb8f53
mode = 0644 mode = 0644
......
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