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

software/abilian/extranet_spr/instance-environment.cfg.in

@@ -14,7 +14,7 @@ EXTRANET_INSTANCE_PATH=$${directories:extranet_spr-instance}
 EXTRANET_INSTANCE_HOST=$${instance-parameters:ipv6-random}
 ABILIAN_CONFIG_EXTRA_PYTHON=$${config-staging-py:rendered}
 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
 PATH=/usr/sbin:/usr/bin:/sbin:/bin:${git:location}/bin:${poppler:location}/bin:${postgresql91:location}/bin:${redis:location}/bin:${unoconv-repository:location}
 

software/abilian/extranet_spr/instance-extranet.cfg.in

@@ -18,8 +18,20 @@ link-binary =
 [extranet-service]
 recipe = slapos.recipe.template:jinja2
 template = inline:
-    #!/bin/sh
+    #!/bin/bash
     . {{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
 rendered = $${directories:services}/abilian-start
 mode = 700

software/abilian/extranet_spr/instance-postgres.cfg.in

@@ -36,6 +36,7 @@ services = $${directories:services}
 template-postgresql-conf =
     # This configuration file is generated by a SlapOS instance profile. Manual edits will be overwritten.
     listen_addresses = '{listen_addresses}'
+    port = $${:port}
     logging_collector = on
     log_rotation_size = 50MB
     max_connections = 100

software/abilian/extranet_spr/instance.cfg.in

@@ -12,9 +12,9 @@ extends =
 
 parts =
     directories
-    sh-instance-environment
     json-configuration
     json-extra-configuration
+    sh-instance-environment
     postgres-instance
     postgres-promise
     extranet-symlinks

software/abilian/extranet_spr/software.cfg

@@ -7,13 +7,16 @@ extends =
   ../../../component/gmp/buildout.cfg
   ../../../component/imagemagick/buildout.cfg
   ../../../component/poppler/buildout.cfg
-  ../../../component/cups/buildout.cfg
-  ../../../component/libreoffice-bin/buildout.cfg
   ../../../component/redis/buildout.cfg
   ../../../component/unoconv/buildout.cfg
   ../../../component/nginx/buildout.cfg
+
+  ../../../component/cups/buildout.cfg
+  ../../../component/dbus/buildout.cfg
   ../../../component/gtk-2/buildout.cfg
   ../../../component/glib/buildout.cfg
+  ../../../component/fontconfig/buildout.cfg
+  ../../../component/libreoffice-bin/buildout.cfg
 
 
 parts =
@@ -44,6 +47,7 @@ parts =
     imagemagick
     poppler
     cups
+    dbus-glib
     libreoffice-bin
     redis
     unoconv-repository
@@ -139,8 +143,8 @@ egg-link = progressbar.egg-link
 
 [abilian-core-repository]
 < = git-repository
-repository = https://github.com/abilian/abilian-core.git
-branch = 0.1-maintenance
+repository = https://github.com/mmariani/abilian-core.git
+branch = 0.1-maintenance-nxd
 
 [abilian-core-repository-check]
 < = git-repository-check
@@ -222,14 +226,14 @@ configure-command =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = 22523112a53b60cb09f131049d0fce90
+md5sum = 963b22f55ba677441603e270ea973ed3
 mode = 0644
 
 [instance-postgres]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-postgres.cfg.in
 output = ${buildout:directory}/instance-postgres.cfg
-md5sum = 8b5557df0aeaa4ace93481688f2d5085
+md5sum = e47ce979db2f12ac2b30814dd20f63f5
 mode = 0644
 
 [instance-redis]
@@ -243,14 +247,14 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-extranet.cfg.in
 output = ${buildout:directory}/instance-extranet.cfg
-md5sum = 3e27239c513c9a7b959f9d118f6ad181
+md5sum = c4e4727a36c5552631e50f98c4079344
 mode = 0644
 
 [instance-environment]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-environment.cfg.in
 output = ${buildout:directory}/instance-environment.cfg
-md5sum = a74401a887080c9f3aea324a384c4e67
+md5sum = 25ba374fe46091e25d1bc8197feb8f53
 mode = 0644