Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
75ae5802
Commit
75ae5802
authored
Jun 10, 2014
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abilian: better $PATH, added cups component
parent
25727e97
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
32 deletions
+6
-32
software/abilian/extranet_spr/instance-environment.cfg.in
software/abilian/extranet_spr/instance-environment.cfg.in
+1
-1
software/abilian/extranet_spr/instance-postgres.cfg.in
software/abilian/extranet_spr/instance-postgres.cfg.in
+0
-27
software/abilian/extranet_spr/instance.cfg.in
software/abilian/extranet_spr/instance.cfg.in
+0
-1
software/abilian/extranet_spr/software.cfg
software/abilian/extranet_spr/software.cfg
+5
-3
No files found.
software/abilian/extranet_spr/instance-environment.cfg.in
View file @
75ae5802
...
@@ -16,7 +16,7 @@ ABILIAN_CONFIG_EXTRA_PYTHON=$${config-staging-py:rendered}
...
@@ -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
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
# 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
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
View file @
75ae5802
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
parts =
parts =
postgres-instance
postgres-instance
postgres-promise
postgres-promise
postgres-symlinks
# Define egg directories to be the one from Software Release
# Define egg directories to be the one from Software Release
...
@@ -88,32 +87,6 @@ hostname = $${instance-parameters:ipv6-random}
...
@@ -88,32 +87,6 @@ hostname = $${instance-parameters:ipv6-random}
port = $${postgres-instance:port}
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
#-- Fetches parameters defined in SlapOS Master for this instance
...
...
software/abilian/extranet_spr/instance.cfg.in
View file @
75ae5802
...
@@ -17,7 +17,6 @@ parts =
...
@@ -17,7 +17,6 @@ parts =
json-extra-configuration
json-extra-configuration
postgres-instance
postgres-instance
postgres-promise
postgres-promise
postgres-symlinks
extranet-symlinks
extranet-symlinks
extranet-service
extranet-service
extranet-promise
extranet-promise
...
...
software/abilian/extranet_spr/software.cfg
View file @
75ae5802
...
@@ -7,6 +7,7 @@ extends =
...
@@ -7,6 +7,7 @@ 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/libreoffice-bin/buildout.cfg
../../../component/redis/buildout.cfg
../../../component/redis/buildout.cfg
../../../component/unoconv/buildout.cfg
../../../component/unoconv/buildout.cfg
...
@@ -42,6 +43,7 @@ parts =
...
@@ -42,6 +43,7 @@ parts =
eggs
eggs
imagemagick
imagemagick
poppler
poppler
cups
libreoffice-bin
libreoffice-bin
redis
redis
unoconv-repository
unoconv-repository
...
@@ -220,14 +222,14 @@ configure-command =
...
@@ -220,14 +222,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 =
e6147118f7d297ad9cefe9d81f96da64
md5sum =
22523112a53b60cb09f131049d0fce90
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 =
f23412091f63f3c7fa914809373751b2
md5sum =
8b5557df0aeaa4ace93481688f2d5085
mode = 0644
mode = 0644
[instance-redis]
[instance-redis]
...
@@ -248,7 +250,7 @@ mode = 0644
...
@@ -248,7 +250,7 @@ mode = 0644
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 =
91e0d35ee13125e51aa3e8653224c41f
md5sum =
a74401a887080c9f3aea324a384c4e67
mode = 0644
mode = 0644
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment