abilian: better $PATH, added cups component

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

@@ -16,7 +16,7 @@ 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
 # abilian/services/conversion.py does not like it, if PATH does not exist
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+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-postgres.cfg.in

@@ -2,7 +2,6 @@
 parts =
   postgres-instance
   postgres-promise
-  postgres-symlinks
 
 
 # Define egg directories to be the one from Software Release
@@ -88,32 +87,6 @@ hostname = $${instance-parameters:ipv6-random}
 port = $${postgres-instance:port}
 
 
-[postgres-symlinks]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${directories:bin}
-link-binary =
-    ${postgresql91:location}/bin/clusterdb
-    ${postgresql91:location}/bin/createdb
-    ${postgresql91:location}/bin/createlang
-    ${postgresql91:location}/bin/createuser
-    ${postgresql91:location}/bin/dropdb
-    ${postgresql91:location}/bin/droplang
-    ${postgresql91:location}/bin/dropuser
-    ${postgresql91:location}/bin/initdb
-    ${postgresql91:location}/bin/psql
-    ${postgresql91:location}/bin/pg_basebackup
-    ${postgresql91:location}/bin/pg_controldata
-    ${postgresql91:location}/bin/pg_ctl
-    ${postgresql91:location}/bin/pg_dump
-    ${postgresql91:location}/bin/pg_dumpall
-    ${postgresql91:location}/bin/pg_resetxlog
-    ${postgresql91:location}/bin/pg_restore
-    ${postgresql91:location}/bin/postgres
-    ${postgresql91:location}/bin/postmaster
-    ${postgresql91:location}/bin/reindexdb
-    ${postgresql91:location}/bin/vacuumdb
-
-
 #----------------
 #--
 #-- Fetches parameters defined in SlapOS Master for this instance

software/abilian/extranet_spr/instance.cfg.in

@@ -17,7 +17,6 @@ parts =
     json-extra-configuration
     postgres-instance
     postgres-promise
-    postgres-symlinks
     extranet-symlinks
     extranet-service
     extranet-promise

software/abilian/extranet_spr/software.cfg

@@ -7,6 +7,7 @@ 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
@@ -42,6 +43,7 @@ parts =
     eggs
     imagemagick
     poppler
+    cups
     libreoffice-bin
     redis
     unoconv-repository
@@ -220,14 +222,14 @@ configure-command =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = e6147118f7d297ad9cefe9d81f96da64
+md5sum = 22523112a53b60cb09f131049d0fce90
 mode = 0644
 
 [instance-postgres]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-postgres.cfg.in
 output = ${buildout:directory}/instance-postgres.cfg
-md5sum = f23412091f63f3c7fa914809373751b2
+md5sum = 8b5557df0aeaa4ace93481688f2d5085
 mode = 0644
 
 [instance-redis]
@@ -248,7 +250,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-environment.cfg.in
 output = ${buildout:directory}/instance-environment.cfg
-md5sum = 91e0d35ee13125e51aa3e8653224c41f
+md5sum = a74401a887080c9f3aea324a384c4e67
 mode = 0644